From 212fc5650acb560307813ab16dfb31da014d3629 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 21 Jun 2011 14:13:10 -0700
Subject: [PATCH] Fix 4686480: Cleanup LockScreen settings

This fix updates the style for buttons to better conform to the screen
by using weightSums.

It also makes layouts much more flexible across platforms by making
better use of the square aspect feature of LockPatternView.

Change-Id: I63677790bf0ac52707c8c356540ecd5dc50ca33b
---
 res/layout-land/choose_lock_pattern.xml     |  5 +++--
 res/layout-land/confirm_lock_pattern.xml    |  5 +++--
 res/layout/choose_lock_pattern.xml          |  5 +++--
 res/layout/choose_lock_pattern_tutorial.xml | 13 ++++---------
 res/layout/confirm_lock_pattern.xml         |  6 ++++--
 res/values/styles.xml                       |  6 ++++--
 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 9af76d10402..588d8da2b03 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 2da2b9a9a7b..8c4e91258a5 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 79307c5f3ee..a3563151f40 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 39fc0a1ffd3..5f6ea56fe3e 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 01ef5b11fb1..5c6d8126e2e 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 2e3c1d959a9..130fa03f904 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>