Skip to content

Commit c40f70a

Browse files
Jake HambyAndroid (Google) Code Review
Jake Hamby
authored and
Android (Google) Code Review
committed
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
2 parents 68f592a + 48d5095 commit c40f70a

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,29 +93,29 @@
9393
android:layout_marginLeft="8dip"
9494
android:layout_marginRight="8dip">
9595

96-
<Button android:id="@+id/ok"
97-
android:text="@android:string/ok"
96+
<Button android:id="@+id/emergencyCallButton"
97+
android:text="@android:string/lockscreen_emergency_call"
9898
android:layout_alignParentBottom="true"
99+
android:layout_centerHorizontal="true"
99100
android:layout_width="0dip"
100101
android:layout_height="wrap_content"
101102
android:layout_weight="1.0"
102103
android:layout_marginBottom="8dip"
103104
android:layout_marginRight="8dip"
104105
android:textSize="18sp"
105-
/>
106+
android:drawableLeft="@drawable/ic_emergency"
107+
android:drawablePadding="8dip"
108+
/>
106109

107-
<Button android:id="@+id/emergencyCallButton"
108-
android:text="@android:string/lockscreen_emergency_call"
110+
<Button android:id="@+id/ok"
111+
android:text="@android:string/ok"
109112
android:layout_alignParentBottom="true"
110-
android:layout_centerHorizontal="true"
111113
android:layout_width="0dip"
112114
android:layout_height="wrap_content"
113115
android:layout_weight="1.0"
114116
android:layout_marginBottom="8dip"
115117
android:layout_marginLeft="8dip"
116118
android:textSize="18sp"
117-
android:drawableLeft="@drawable/ic_emergency"
118-
android:drawablePadding="8dip"
119119
/>
120120
</LinearLayout>
121121

‎core/res/res/layout/keyguard_screen_sim_pin_landscape.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,29 @@
9191
android:layout_marginLeft="8dip"
9292
android:layout_marginRight="8dip">
9393

94-
<Button android:id="@+id/ok"
95-
android:text="@android:string/ok"
94+
<Button android:id="@+id/emergencyCallButton"
95+
android:text="@android:string/lockscreen_emergency_call"
9696
android:layout_alignParentBottom="true"
97+
android:layout_centerHorizontal="true"
9798
android:layout_width="0dip"
9899
android:layout_height="wrap_content"
99100
android:layout_weight="1.0"
100101
android:layout_marginBottom="8dip"
101102
android:layout_marginRight="8dip"
102103
android:textSize="18sp"
103-
/>
104+
android:drawableLeft="@drawable/ic_emergency"
105+
android:drawablePadding="4dip"
106+
/>
104107

105-
<Button android:id="@+id/emergencyCallButton"
106-
android:text="@android:string/lockscreen_emergency_call"
108+
<Button android:id="@+id/ok"
109+
android:text="@android:string/ok"
107110
android:layout_alignParentBottom="true"
108-
android:layout_centerHorizontal="true"
109111
android:layout_width="0dip"
110112
android:layout_height="wrap_content"
111113
android:layout_weight="1.0"
112114
android:layout_marginBottom="8dip"
113115
android:layout_marginLeft="8dip"
114116
android:textSize="18sp"
115-
android:drawableLeft="@drawable/ic_emergency"
116-
android:drawablePadding="4dip"
117117
/>
118118
</LinearLayout>
119119

‎core/res/res/layout/keyguard_screen_sim_puk_landscape.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,29 +153,29 @@
153153
android:layout_marginLeft="8dip"
154154
android:layout_marginRight="8dip">
155155

156-
<Button android:id="@+id/ok"
157-
android:text="@android:string/ok"
156+
<Button android:id="@+id/emergencyCallButton"
157+
android:text="@android:string/lockscreen_emergency_call"
158158
android:layout_alignParentBottom="true"
159+
android:layout_centerHorizontal="true"
159160
android:layout_width="0dip"
160161
android:layout_height="wrap_content"
161162
android:layout_weight="1.0"
162163
android:layout_marginBottom="8dip"
163164
android:layout_marginRight="8dip"
164165
android:textSize="18sp"
165-
/>
166+
android:drawableLeft="@drawable/ic_emergency"
167+
android:drawablePadding="4dip"
168+
/>
166169

167-
<Button android:id="@+id/emergencyCallButton"
168-
android:text="@android:string/lockscreen_emergency_call"
170+
<Button android:id="@+id/ok"
171+
android:text="@android:string/ok"
169172
android:layout_alignParentBottom="true"
170-
android:layout_centerHorizontal="true"
171173
android:layout_width="0dip"
172174
android:layout_height="wrap_content"
173175
android:layout_weight="1.0"
174176
android:layout_marginBottom="8dip"
175177
android:layout_marginLeft="8dip"
176178
android:textSize="18sp"
177-
android:drawableLeft="@drawable/ic_emergency"
178-
android:drawablePadding="4dip"
179179
/>
180180
</LinearLayout>
181181

‎core/res/res/layout/twelve_key_entry.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@
144144
android:layout_marginRight="2dip"
145145
android:orientation="horizontal">
146146

147-
<Button android:id="@+id/ok"
147+
<Button android:id="@+id/cancel"
148148
android:layout_width="0sp"
149149
android:layout_height="fill_parent"
150150
android:layout_weight="1"
151151
android:layout_marginLeft="2dip"
152152
android:layout_marginRight="2dip"
153153
android:textAppearance="?android:attr/textAppearanceMedium"
154154
android:textStyle="bold"
155-
android:text="@android:string/ok"
155+
android:text="@android:string/cancel"
156156
/>
157157

158158
<Button android:id="@+id/zero"
@@ -165,15 +165,15 @@
165165
android:textStyle="bold"
166166
/>
167167

168-
<Button android:id="@+id/cancel"
168+
<Button android:id="@+id/ok"
169169
android:layout_width="0sp"
170170
android:layout_height="fill_parent"
171171
android:layout_weight="1"
172172
android:layout_marginLeft="2dip"
173173
android:layout_marginRight="2dip"
174174
android:textAppearance="?android:attr/textAppearanceMedium"
175175
android:textStyle="bold"
176-
android:text="@android:string/cancel"
176+
android:text="@android:string/ok"
177177
/>
178178

179179
</LinearLayout>

0 commit comments

Comments
 (0)