Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

Browse Source 
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
This commit is contained in:
Jake Hamby
2011-12-08 15:53:42 -08:00
committed by Android Git Automerger
parent ebfce84f7f c40f70a5cb
commit 555fe79cdf
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml
View File

@@ -93,17 +93,6 @@
android:layout_marginLeft="8dip" android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"> android:layout_marginRight="8dip">
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginRight="8dip"
android:textSize="18sp"
/>
<Button android:id="@+id/emergencyCallButton" <Button android:id="@+id/emergencyCallButton"
android:text="@android:string/lockscreen_emergency_call" android:text="@android:string/lockscreen_emergency_call"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
@@ -112,11 +101,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.0"
android:layout_marginBottom="8dip" android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip" android:layout_marginRight="8dip"
android:textSize="18sp" android:textSize="18sp"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
/> />
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip"
android:textSize="18sp"
/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

24
core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
View File

@@ -91,17 +91,6 @@
android:layout_marginLeft="8dip" android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"> android:layout_marginRight="8dip">
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginRight="8dip"
android:textSize="18sp"
/>
<Button android:id="@+id/emergencyCallButton" <Button android:id="@+id/emergencyCallButton"
android:text="@android:string/lockscreen_emergency_call" android:text="@android:string/lockscreen_emergency_call"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
@@ -110,11 +99,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.0"
android:layout_marginBottom="8dip" android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip" android:layout_marginRight="8dip"
android:textSize="18sp" android:textSize="18sp"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="4dip" android:drawablePadding="4dip"
/> />
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip"
android:textSize="18sp"
/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

24
core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
View File

@@ -153,17 +153,6 @@
android:layout_marginLeft="8dip" android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"> android:layout_marginRight="8dip">
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginRight="8dip"
android:textSize="18sp"
/>
<Button android:id="@+id/emergencyCallButton" <Button android:id="@+id/emergencyCallButton"
android:text="@android:string/lockscreen_emergency_call" android:text="@android:string/lockscreen_emergency_call"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
@@ -172,11 +161,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.0"
android:layout_marginBottom="8dip" android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip" android:layout_marginRight="8dip"
android:textSize="18sp" android:textSize="18sp"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="4dip" android:drawablePadding="4dip"
/> />
<Button android:id="@+id/ok"
android:text="@android:string/ok"
android:layout_alignParentBottom="true"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginBottom="8dip"
android:layout_marginLeft="8dip"
android:textSize="18sp"
/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

8
core/res/res/layout/twelve_key_entry.xml
View File

@@ -144,7 +144,7 @@
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:orientation="horizontal"> android:orientation="horizontal">
<Button android:id="@+id/ok" <Button android:id="@+id/cancel"
android:layout_width="0sp" android:layout_width="0sp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
@@ -152,7 +152,7 @@
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" android:textStyle="bold"
android:text="@android:string/ok" android:text="@android:string/cancel"
/> />
<Button android:id="@+id/zero" <Button android:id="@+id/zero"
@@ -165,7 +165,7 @@
android:textStyle="bold" android:textStyle="bold"
/> />
<Button android:id="@+id/cancel" <Button android:id="@+id/ok"
android:layout_width="0sp" android:layout_width="0sp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
@@ -173,7 +173,7 @@
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" android:textStyle="bold"
android:text="@android:string/cancel" android:text="@android:string/ok"
/> />
</LinearLayout> </LinearLayout>