Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev

5 files changed, 10 insertions, 4 deletions

diff --git a/core/res/res/layout/keyguard_pin_view.xml b/core/res/res/layout/keyguard_pin_view.xml
index 29e69f30d576..d6cfe2acd324 100644
--- a/core/res/res/layout/keyguard_pin_view.xml
+++ b/core/res/res/layout/keyguard_pin_view.xml
@@ -193,10 +193,10 @@
         <ImageButton
             android:id="@+id/key_enter"
             style="@style/Widget.Button.NumPadKey"
-            android:gravity="center"
             android:layout_width="0px"
             android:layout_height="match_parent"
             android:layout_weight="1"
+			android:paddingRight="30dp"
             android:src="@drawable/sym_keyboard_return_holo"
             android:contentDescription="@string/keyboardview_keycode_enter"
             />
diff --git a/core/res/res/layout/keyguard_sim_pin_view.xml b/core/res/res/layout/keyguard_sim_pin_view.xml
index aed73e5ab7a6..36e1b150cff7 100644
--- a/core/res/res/layout/keyguard_sim_pin_view.xml
+++ b/core/res/res/layout/keyguard_sim_pin_view.xml
@@ -65,6 +65,7 @@
             android:paddingLeft="24dp"
             android:paddingRight="24dp"
             android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/keyboardview_keycode_delete"
             />
     </LinearLayout>
     <View
@@ -197,11 +198,12 @@
         <ImageButton
             android:id="@+id/key_enter"
             style="@style/Widget.Button.NumPadKey"
-            android:gravity="center"
             android:layout_width="0px"
             android:layout_height="match_parent"
             android:layout_weight="1"
+			android:paddingRight="30dp"
             android:src="@drawable/sym_keyboard_return_holo"
+            android:contentDescription="@string/keyboardview_keycode_enter"
             />
     </LinearLayout>
 
diff --git a/core/res/res/layout/keyguard_sim_puk_view.xml b/core/res/res/layout/keyguard_sim_puk_view.xml
index 7eec2cae4908..e846a7bb9b9b 100644
--- a/core/res/res/layout/keyguard_sim_puk_view.xml
+++ b/core/res/res/layout/keyguard_sim_puk_view.xml
@@ -66,6 +66,7 @@
             android:paddingLeft="24dp"
             android:paddingRight="24dp"
             android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/keyboardview_keycode_delete"
             />
     </LinearLayout>
     <View
@@ -198,11 +199,12 @@
         <ImageButton
             android:id="@+id/key_enter"
             style="@style/Widget.Button.NumPadKey"
-            android:gravity="center"
             android:layout_width="0px"
             android:layout_height="match_parent"
             android:layout_weight="1"
+			android:paddingRight="30dp"
             android:src="@drawable/sym_keyboard_return_holo"
+            android:contentDescription="@string/keyboardview_keycode_enter"
             />
     </LinearLayout>
 
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 180f864bb3c4..f489786937de 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -2482,13 +2482,14 @@ please see styles_device_defaults.xml.
     <style name="Widget.Button.NumPadKey"
             parent="@android:style/Widget.Button">
         <item name="android:singleLine">true</item>
-        <item name="android:padding">6dip</item>
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">?android:attr/selectableItemBackground</item>
         <item name="android:textSize">34dp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">#ffffff</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">20dp</item>
     </style>
     <style name="TextAppearance.NumPadKey"
             parent="@android:style/TextAppearance">
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/NumPadKey.java b/policy/src/com/android/internal/policy/impl/keyguard/NumPadKey.java
index 1fb601f2f9f5..a0038bc92fda 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/NumPadKey.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/NumPadKey.java
@@ -89,6 +89,7 @@ public class NumPadKey extends Button {
                 final String extra = sKlondike[mDigit];
                 final int extraLen = extra.length();
                 if (extraLen > 0) {
+                    builder.append(" ");
                     builder.append(extra);
                     builder.setSpan(
                         new TextAppearanceSpan(context, R.style.TextAppearance_NumPadKey_Klondike),