diff options
| author | Danielle Millett <dmillett@google.com> | 2012-11-21 11:20:10 -0500 |
|---|---|---|
| committer | Danielle Millett <dmillett@google.com> | 2012-11-30 21:55:33 -0500 |
| commit | aeb199ab00cb8f470a14f02fe2e67527ca72e737 (patch) | |
| tree | 33520cdd994c6bc3a68bed01499ef86a0ab12cfb /res/layout-sw600dp | |
| parent | 495626818d5fcba9c7e15c23788a55e456116260 (diff) | |
| download | packages_apps_Settings-aeb199ab00cb8f470a14f02fe2e67527ca72e737.zip packages_apps_Settings-aeb199ab00cb8f470a14f02fe2e67527ca72e737.tar.gz packages_apps_Settings-aeb199ab00cb8f470a14f02fe2e67527ca72e737.tar.bz2 | |
Better layouts for security screen setups as part of b/7459863
The major change is that choose pattern and confirm pattern layouts
no longer uses a split screen layout on tablets. The new layout
closely mimics the layout for portrait.
Other minor changes include:
-Made the header font size for confirm pattern and choose pattern
medium (this matches with face unlock changes).
-Made the buttons on choose pattern for landscape phone side-by-side
rather than above each other (to be consistent with face unlock).
-Removed the black background from phone landscape confirm pattern
since it's inconsistent with all the other layouts.
Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
Diffstat (limited to 'res/layout-sw600dp')
| -rw-r--r-- | res/layout-sw600dp/choose_lock_pattern.xml | 8 | ||||
| -rw-r--r-- | res/layout-sw600dp/confirm_lock_pattern.xml | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml index b0efa8c..dec8244 100644 --- a/res/layout-sw600dp/choose_lock_pattern.xml +++ b/res/layout-sw600dp/choose_lock_pattern.xml @@ -27,12 +27,14 @@ <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:layout_marginTop="96dip"> <TextView android:id="@+id/headerText" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> @@ -41,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dip" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceMedium" android:visibility="gone"/> <!-- bottom: lock pattern --> diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml index d41525a..c32422e 100644 --- a/res/layout-sw600dp/confirm_lock_pattern.xml +++ b/res/layout-sw600dp/confirm_lock_pattern.xml @@ -26,12 +26,14 @@ <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:layout_marginTop="96dip"> <TextView android:id="@+id/headerText" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> @@ -40,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dip" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:textAppearance="?android:attr/textAppearanceMedium"/> <!-- bottom: lock pattern --> <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" |