Skip to content

Commit 6df21fa

Browse files
teleshoesteleshoes
committed
tts: revert the whitespace change to keep non-breaking merges
1 parent 44d0ef9 commit 6df21fa

1 file changed

Lines changed: 175 additions & 175 deletions

File tree

‎android/res/layout/tts_toolbar.xml‎

Lines changed: 175 additions & 175 deletions
Original file line numberDiff line numberDiff line change
@@ -24,183 +24,183 @@
2424
android:baselineAligned="true"
2525
android:orientation="vertical">
2626

27-
<LinearLayout
28-
android:id="@+id/tts_toolbar_buttons"
29-
android:layout_width="fill_parent"
27+
<LinearLayout
28+
android:id="@+id/tts_toolbar_buttons"
29+
android:layout_width="fill_parent"
30+
android:layout_height="wrap_content"
31+
android:baselineAligned="true"
32+
android:orientation="horizontal">
33+
34+
<ImageButton
35+
android:id="@+id/tts_play_pause"
36+
android:layout_width="0dip"
37+
android:layout_height="wrap_content"
38+
android:layout_marginLeft="2dip"
39+
android:layout_marginTop="5dip"
40+
android:layout_marginRight="2dip"
41+
android:layout_marginBottom="5dip"
42+
android:layout_weight="1"
43+
android:contentDescription="@string/tts_play"
44+
android:focusable="false"
45+
android:focusableInTouchMode="false"
46+
android:src="?attr/ic_media_play_drawable" />
47+
48+
<ImageButton
49+
android:id="@+id/tts_back"
50+
android:layout_width="0dip"
51+
android:layout_height="wrap_content"
52+
android:layout_marginLeft="2dip"
53+
android:layout_marginTop="5dip"
54+
android:layout_marginRight="2dip"
55+
android:layout_marginBottom="5dip"
56+
android:layout_weight="1"
57+
android:contentDescription="@string/tts_back"
58+
android:focusable="false"
59+
android:focusableInTouchMode="false"
60+
android:src="?attr/ic_media_rew_drawable" />
61+
62+
<ImageButton
63+
android:id="@+id/tts_forward"
64+
android:layout_width="0dip"
65+
android:layout_height="wrap_content"
66+
android:layout_marginLeft="2dip"
67+
android:layout_marginTop="5dip"
68+
android:layout_marginRight="2dip"
69+
android:layout_marginBottom="5dip"
70+
android:layout_weight="1"
71+
android:contentDescription="@string/tts_forward"
72+
android:focusable="false"
73+
android:focusableInTouchMode="false"
74+
android:src="?attr/ic_media_ff_drawable" />
75+
76+
<ImageButton
77+
android:id="@+id/tts_stop"
78+
android:layout_width="0dip"
79+
android:layout_height="wrap_content"
80+
android:layout_marginLeft="2dip"
81+
android:layout_marginTop="5dip"
82+
android:layout_marginRight="2dip"
83+
android:layout_marginBottom="5dip"
84+
android:layout_weight="1"
85+
android:contentDescription="@string/tts_stop"
86+
android:focusable="false"
87+
android:focusableInTouchMode="false"
88+
android:src="?attr/ic_media_stop_drawable" />
89+
90+
<ImageButton
91+
android:id="@+id/tts_options"
92+
android:layout_width="wrap_content"
93+
android:layout_height="wrap_content"
94+
android:layout_marginLeft="2dip"
95+
android:layout_marginTop="5dip"
96+
android:layout_marginRight="2dip"
97+
android:layout_marginBottom="5dip"
98+
android:layout_weight="0"
99+
android:contentDescription="@string/tts_options"
100+
android:focusable="false"
101+
android:focusableInTouchMode="false"
102+
android:src="?attr/cr3_viewer_settings_drawable" />
103+
</LinearLayout>
104+
105+
<LinearLayout
106+
android:layout_width="fill_parent"
107+
android:layout_height="wrap_content"
108+
android:baselineAligned="true"
109+
android:orientation="horizontal">
110+
111+
<ImageButton
112+
android:id="@+id/btn_dec_volume"
113+
android:layout_width="wrap_content"
114+
android:layout_height="wrap_content"
115+
android:layout_marginStart="2dp"
116+
android:layout_marginLeft="2dp"
117+
android:contentDescription="@string/btn_decrease"
118+
android:padding="1dp"
119+
android:src="?attr/cr3_button_dec_drawable" />
120+
121+
<TextView
122+
android:id="@+id/tts_lbl_volume"
123+
android:layout_width="0dip"
124+
android:layout_height="wrap_content"
125+
android:layout_marginLeft="5dip"
126+
android:layout_marginTop="5dip"
127+
android:layout_marginRight="5dip"
128+
android:layout_marginBottom="2dip"
129+
android:layout_weight="1"
130+
android:text="@string/tts_volume" />
131+
132+
<ImageButton
133+
android:id="@+id/btn_inc_volume"
134+
android:layout_width="wrap_content"
30135
android:layout_height="wrap_content"
31-
android:baselineAligned="true"
32-
android:orientation="horizontal">
33-
34-
<ImageButton
35-
android:id="@+id/tts_play_pause"
36-
android:layout_width="0dip"
37-
android:layout_height="wrap_content"
38-
android:layout_marginLeft="2dip"
39-
android:layout_marginTop="5dip"
40-
android:layout_marginRight="2dip"
41-
android:layout_marginBottom="5dip"
42-
android:layout_weight="1"
43-
android:contentDescription="@string/tts_play"
44-
android:focusable="false"
45-
android:focusableInTouchMode="false"
46-
android:src="?attr/ic_media_play_drawable" />
47-
48-
<ImageButton
49-
android:id="@+id/tts_back"
50-
android:layout_width="0dip"
51-
android:layout_height="wrap_content"
52-
android:layout_marginLeft="2dip"
53-
android:layout_marginTop="5dip"
54-
android:layout_marginRight="2dip"
55-
android:layout_marginBottom="5dip"
56-
android:layout_weight="1"
57-
android:contentDescription="@string/tts_back"
58-
android:focusable="false"
59-
android:focusableInTouchMode="false"
60-
android:src="?attr/ic_media_rew_drawable" />
61-
62-
<ImageButton
63-
android:id="@+id/tts_forward"
64-
android:layout_width="0dip"
65-
android:layout_height="wrap_content"
66-
android:layout_marginLeft="2dip"
67-
android:layout_marginTop="5dip"
68-
android:layout_marginRight="2dip"
69-
android:layout_marginBottom="5dip"
70-
android:layout_weight="1"
71-
android:contentDescription="@string/tts_forward"
72-
android:focusable="false"
73-
android:focusableInTouchMode="false"
74-
android:src="?attr/ic_media_ff_drawable" />
75-
76-
<ImageButton
77-
android:id="@+id/tts_stop"
78-
android:layout_width="0dip"
79-
android:layout_height="wrap_content"
80-
android:layout_marginLeft="2dip"
81-
android:layout_marginTop="5dip"
82-
android:layout_marginRight="2dip"
83-
android:layout_marginBottom="5dip"
84-
android:layout_weight="1"
85-
android:contentDescription="@string/tts_stop"
86-
android:focusable="false"
87-
android:focusableInTouchMode="false"
88-
android:src="?attr/ic_media_stop_drawable" />
89-
90-
<ImageButton
91-
android:id="@+id/tts_options"
92-
android:layout_width="wrap_content"
93-
android:layout_height="wrap_content"
94-
android:layout_marginLeft="2dip"
95-
android:layout_marginTop="5dip"
96-
android:layout_marginRight="2dip"
97-
android:layout_marginBottom="5dip"
98-
android:layout_weight="0"
99-
android:contentDescription="@string/tts_options"
100-
android:focusable="false"
101-
android:focusableInTouchMode="false"
102-
android:src="?attr/cr3_viewer_settings_drawable" />
103-
</LinearLayout>
104-
105-
<LinearLayout
106-
android:layout_width="fill_parent"
136+
android:layout_marginEnd="10dp"
137+
android:layout_marginRight="10dp"
138+
android:contentDescription="@string/btn_increase"
139+
android:padding="1dp"
140+
android:src="?attr/cr3_button_inc_drawable" />
141+
142+
<ImageButton
143+
android:id="@+id/btn_dec_speed"
144+
android:layout_width="wrap_content"
145+
android:layout_height="wrap_content"
146+
android:layout_marginStart="10dp"
147+
android:layout_marginLeft="10dp"
148+
android:contentDescription="@string/btn_decrease"
149+
android:padding="1dp"
150+
android:src="?attr/cr3_button_dec_drawable" />
151+
152+
<TextView
153+
android:id="@+id/tts_lbl_speed"
154+
android:layout_width="0dip"
155+
android:layout_height="wrap_content"
156+
android:layout_marginLeft="5dip"
157+
android:layout_marginTop="5dip"
158+
android:layout_marginRight="5dip"
159+
android:layout_marginBottom="2dip"
160+
android:layout_weight="1"
161+
android:text="@string/tts_rate" />
162+
163+
<ImageButton
164+
android:id="@+id/btn_inc_speed"
165+
android:layout_width="wrap_content"
166+
android:layout_height="wrap_content"
167+
android:layout_marginEnd="2dp"
168+
android:layout_marginRight="2dp"
169+
android:contentDescription="@string/btn_increase"
170+
android:padding="1dp"
171+
android:src="?attr/cr3_button_inc_drawable" />
172+
173+
</LinearLayout>
174+
175+
<LinearLayout
176+
android:layout_width="fill_parent"
177+
android:layout_height="wrap_content"
178+
android:baselineAligned="true"
179+
android:orientation="horizontal">
180+
181+
<SeekBar
182+
android:id="@+id/tts_sb_volume"
183+
android:layout_width="0dip"
107184
android:layout_height="wrap_content"
108-
android:baselineAligned="true"
109-
android:orientation="horizontal">
110-
111-
<ImageButton
112-
android:id="@+id/btn_dec_volume"
113-
android:layout_width="wrap_content"
114-
android:layout_height="wrap_content"
115-
android:layout_marginStart="2dp"
116-
android:layout_marginLeft="2dp"
117-
android:contentDescription="@string/btn_decrease"
118-
android:padding="1dp"
119-
android:src="?attr/cr3_button_dec_drawable" />
120-
121-
<TextView
122-
android:id="@+id/tts_lbl_volume"
123-
android:layout_width="0dip"
124-
android:layout_height="wrap_content"
125-
android:layout_marginLeft="5dip"
126-
android:layout_marginTop="5dip"
127-
android:layout_marginRight="5dip"
128-
android:layout_marginBottom="2dip"
129-
android:layout_weight="1"
130-
android:text="@string/tts_volume" />
131-
132-
<ImageButton
133-
android:id="@+id/btn_inc_volume"
134-
android:layout_width="wrap_content"
135-
android:layout_height="wrap_content"
136-
android:layout_marginEnd="10dp"
137-
android:layout_marginRight="10dp"
138-
android:contentDescription="@string/btn_increase"
139-
android:padding="1dp"
140-
android:src="?attr/cr3_button_inc_drawable" />
141-
142-
<ImageButton
143-
android:id="@+id/btn_dec_speed"
144-
android:layout_width="wrap_content"
145-
android:layout_height="wrap_content"
146-
android:layout_marginStart="10dp"
147-
android:layout_marginLeft="10dp"
148-
android:contentDescription="@string/btn_decrease"
149-
android:padding="1dp"
150-
android:src="?attr/cr3_button_dec_drawable" />
151-
152-
<TextView
153-
android:id="@+id/tts_lbl_speed"
154-
android:layout_width="0dip"
155-
android:layout_height="wrap_content"
156-
android:layout_marginLeft="5dip"
157-
android:layout_marginTop="5dip"
158-
android:layout_marginRight="5dip"
159-
android:layout_marginBottom="2dip"
160-
android:layout_weight="1"
161-
android:text="@string/tts_rate" />
162-
163-
<ImageButton
164-
android:id="@+id/btn_inc_speed"
165-
android:layout_width="wrap_content"
166-
android:layout_height="wrap_content"
167-
android:layout_marginEnd="2dp"
168-
android:layout_marginRight="2dp"
169-
android:contentDescription="@string/btn_increase"
170-
android:padding="1dp"
171-
android:src="?attr/cr3_button_inc_drawable" />
172-
173-
</LinearLayout>
174-
175-
<LinearLayout
176-
android:layout_width="fill_parent"
185+
android:layout_marginStart="2dip"
186+
android:layout_marginLeft="2dip"
187+
android:layout_marginTop="5dip"
188+
android:layout_marginEnd="10dip"
189+
android:layout_marginRight="10dip"
190+
android:layout_marginBottom="5dip"
191+
android:layout_weight="1" />
192+
193+
<SeekBar
194+
android:id="@+id/tts_sb_speed"
195+
android:layout_width="0dip"
177196
android:layout_height="wrap_content"
178-
android:baselineAligned="true"
179-
android:orientation="horizontal">
180-
181-
<SeekBar
182-
android:id="@+id/tts_sb_volume"
183-
android:layout_width="0dip"
184-
android:layout_height="wrap_content"
185-
android:layout_marginStart="2dip"
186-
android:layout_marginLeft="2dip"
187-
android:layout_marginTop="5dip"
188-
android:layout_marginEnd="10dip"
189-
android:layout_marginRight="10dip"
190-
android:layout_marginBottom="5dip"
191-
android:layout_weight="1" />
192-
193-
<SeekBar
194-
android:id="@+id/tts_sb_speed"
195-
android:layout_width="0dip"
196-
android:layout_height="wrap_content"
197-
android:layout_marginStart="10dip"
198-
android:layout_marginLeft="10dip"
199-
android:layout_marginTop="5dip"
200-
android:layout_marginEnd="2dip"
201-
android:layout_marginRight="2dip"
202-
android:layout_marginBottom="5dip"
203-
android:layout_weight="1" />
204-
</LinearLayout>
197+
android:layout_marginStart="10dip"
198+
android:layout_marginLeft="10dip"
199+
android:layout_marginTop="5dip"
200+
android:layout_marginEnd="2dip"
201+
android:layout_marginRight="2dip"
202+
android:layout_marginBottom="5dip"
203+
android:layout_weight="1" />
205204
</LinearLayout>
205+
</LinearLayout>
206206
</RelativeLayout>

0 commit comments

Comments
 (0)