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
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index 627ff02..b9dd27a 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -16,78 +16,48 @@
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal">
- <!-- left side: lock pattern widget -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal|center_vertical"
- android:orientation="horizontal">
+ <!-- header message -->
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:layout_marginTop="40dip">
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="354dip"
- android:layout_height="354dip"
- aspect="square"/>
-
- </RelativeLayout>
-
- <!-- right side: instructions and buttons -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal">
-
- <!-- confirm / restart buttons -->
- <LinearLayout android:id="@+id/buttonContainer"
- style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal"
- android:visibility="invisible">
-
- <!-- left / top button: skip, or re-try -->
- <Button android:id="@+id/footerLeftButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_restart_button_text"/>
-
- <!-- right / bottom button: confirm or ok -->
- <Button android:id="@+id/footerRightButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_confirm_button_text"/>
-
- </LinearLayout>
-
- <!-- footer message -->
- <TextView android:id="@+id/footerText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_above="@id/buttonContainer"
- android:layout_marginTop="16dip"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <!-- header message -->
- <ScrollView
+ <TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginTop="20dip"
- android:layout_marginStart="20dip"
- android:layout_above="@id/footerText"
- android:gravity="center_vertical|center_horizontal">
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
- <TextView android:id="@+id/headerText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="22sp"/>
+ </ScrollView>
- </ScrollView>
+ <!-- footer message -->
+ <TextView android:id="@+id/footerText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
- </RelativeLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="0.6"/>
+
+ <!-- lock pattern widget -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ aspect="square"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>