commit 0707fdc2e0e01b2cb1b47c4aca98b2d4538e468b
author Maurice Lam <yukl@google.com> Thu Jun 16 16:15:44 2016 -0700
committer Maurice Lam <yukl@google.com> Thu Jun 16 16:16:25 2016 -0700
tree 18bc420236bd135e3b95c85b7a34c6172b40be20
parent 223d45ea0ed96e10911cfbf4f5b3ca770be30fbe

Center pattern lock screen vertically

Pull the header into the content area, so that the pattern view on
the right side can be centered overall, rather than centered starting
below the title.

Bug: 24405946
Change-Id: I6c9cfe8175014e40c9e1fc78d4c15e027860d8fe

res/layout-land/choose_lock_pattern.xml

diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index a896ceb..89e3d57 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -21,11 +21,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
+    android:layout="@layout/suw_glif_blank_template"
     settings:suwHeaderText="@string/lock_settings_picker_title">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:orientation="horizontal"
@@ -37,8 +37,34 @@
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1.0"
+            android:layout_marginStart="?attr/suwMarginSides"
+            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
             android:orientation="vertical">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    style="@style/SuwGlifIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp"
+                    android:src="@drawable/ic_lock" />
+
+                <TextView
+                    android:id="@+id/suw_layout_title"
+                    style="@style/SuwGlifHeaderTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp" />
+
+            </LinearLayout>
+
             <!-- header message -->
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
@@ -103,10 +129,10 @@
             android:layout_weight="1.0">
 
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-                 android:layout_width="match_parent"
-                 android:layout_height="match_parent"
-                 android:layout_gravity="center"
-                 android:background="@color/lock_pattern_background" />
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@color/lock_pattern_background" />
 
         </FrameLayout>