diff options
| author | Jim Miller <jaggies@google.com> | 2011-06-21 14:13:10 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-06-28 12:56:39 -0700 |
| commit | 212fc5650acb560307813ab16dfb31da014d3629 (patch) | |
| tree | 616b26752371f1cff94e8d35a1fa86da2b739dd1 /res/layout | |
| parent | 2b74a839e029228370be93aafa283774bfcb90fa (diff) | |
| download | packages_apps_Settings-212fc5650acb560307813ab16dfb31da014d3629.tar.gz packages_apps_Settings-212fc5650acb560307813ab16dfb31da014d3629.tar.bz2 packages_apps_Settings-212fc5650acb560307813ab16dfb31da014d3629.zip | |
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
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/choose_lock_pattern.xml | 5 | ||||
| -rw-r--r-- | res/layout/choose_lock_pattern_tutorial.xml | 13 | ||||
| -rw-r--r-- | res/layout/confirm_lock_pattern.xml | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml index 79307c5f3..a3563151f 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 39fc0a1ff..5f6ea56fe 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 01ef5b11f..5c6d8126e 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" |