Fix 4462497: Make lockscreen preference screen layouts more dynamic

This reduces the dependency of LockScreen preference screens
on a particular device size by using centering logic instead of
absolute offsets/sizes.

Change-Id: I6ff9e71dc122e12493148437dda647820ae0f308

3 files changed, 41 insertions, 22 deletions

diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index 6b7b90e..d8f85cc 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -22,19 +22,26 @@
     android:gravity="center_horizontal">
 
     <!-- top: instructions and buttons -->
+
     <!-- header message -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="542dip"
-        android:layout_height="78dip"
-        android:layout_marginTop="96dip"
-        android:textSize="22sp"/>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    </ScrollView>
 
     <!-- footer message -->
     <TextView android:id="@+id/footerText"
-        android:layout_width="542dip"
-        android:layout_height="78dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="16dip"
-        android:textSize="22sp"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:visibility="gone"/>
 
     <!-- bottom: lock pattern -->
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
index c7bdc88..2a61666 100644
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -23,12 +23,18 @@
 
     <!-- top: instructions and buttons -->
     <!-- header message -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="542dip"
-        android:layout_height="78dip"
-        android:layout_marginTop="96dip"
-        android:textSize="22sp"
-        android:text="@string/lock_intro_message"/>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/lock_intro_message"/>
+
+    </ScrollView>
 
     <!-- bottom: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index 6bffaef..d41525a 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -23,18 +23,24 @@
 
     <!-- top: instructions and buttons -->
     <!-- header message -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="542dip"
-        android:layout_height="78dip"
-        android:layout_marginTop="96dip"
-        android:textSize="22sp"/>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    </ScrollView>
 
     <!-- footer message -->
     <TextView android:id="@+id/footerText"
-        android:layout_width="542dip"
-        android:layout_height="78dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="16dip"
-        android:textSize="22sp"/>
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
 
     <!-- bottom: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"