Fix LockScreen Settings on phones.

Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807

1 files changed, 19 insertions, 30 deletions

diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 3ab137425..a854b9a84 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -29,14 +29,13 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <!-- spacer above text entry field -->
     <View
         android:id="@+id/spacerBottom"
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:layout_marginTop="6dip"
         android:background="@android:drawable/divider_horizontal_dark"
     />
 
@@ -49,8 +48,7 @@
         android:inputType="textPassword"
         android:gravity="center"
         android:layout_gravity="center"
-        android:textSize="32sp"
-        android:layout_marginTop="15dip"
+        android:textSize="24sp"
         android:layout_marginLeft="30dip"
         android:layout_marginRight="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -64,39 +62,30 @@
         android:layout_height="0dip"
         android:layout_weight="1" />
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
+
+        <!-- left : cancel -->
+        <Button android:id="@+id/cancel_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_cancel_label"/>
+
+        <!-- right : continue -->
+        <Button android:id="@+id/next_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_continue_label"/>
+
+    </LinearLayout>
+
     <!-- Alphanumeric keyboard -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#00000000"
-        android:layout_marginBottom="30dip"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
 
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
-
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
-
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
-
-    </RelativeLayout>
-
 </LinearLayout>