Merge "Fix 4686480: Cleanup LockScreen settings"

6 files changed, 21 insertions, 19 deletions

diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 9af76d1..588d8da 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -82,10 +82,11 @@
          android:background="@*android:drawable/code_lock_left"
          android:layout_width="2dip"
          android:layout_height="match_parent" />
+
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 2da2b9a..8c4e912 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -56,10 +56,11 @@
          android:background="@*android:drawable/code_lock_left"
          android:layout_width="2dip"
          android:layout_height="match_parent" />
+
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index 79307c5..a356315 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -39,9 +39,10 @@
              android:background="@*android:drawable/code_lock_top"
              android:layout_width="match_parent"
              android:layout_height="2dip" />
+
         <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content" />
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
 
         <!-- bottom line looks bad when button bar is their too, omit in this case -->
         <!--View
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 39fc0a1..5f6ea56 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -54,16 +54,11 @@
 
     </ScrollView>
 
-    <!-- bottom: lock pattern -->
+    <!-- bottom: lock pattern. Note the size is match_parent in both axis since requested aspect
+         is square and the pattern view will choose the smaller of the two. -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="300dip"
-         android:layout_height="300dip"
-         aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"/>
 
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index 01ef5b1..5c6d812 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -32,9 +32,11 @@
          android:background="@*android:drawable/code_lock_top"
          android:layout_width="match_parent"
          android:layout_height="2dip" />
+
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
+
     <View
          android:background="@*android:drawable/code_lock_bottom"
          android:layout_width="match_parent"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2e3c1d9..130fa03 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -126,13 +126,15 @@
     </style>
 
     <style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:weightSum">2</item>
         <item name="android:dividerPadding">8dip</item>
     </style>
 
     <style name="SecurityPreferenceButton" parent="@android:style/Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">140dip</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">1</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>