commit 7b6791d12610c19d51b208cdb939c60350836624
author Maurice Lam <yukl@google.com> Mon May 09 18:22:08 2016 -0700
committer Maurice Lam <yukl@google.com> Wed May 11 11:23:43 2016 -0700
tree 206198faceed89491bede68ebf4a7d34f5fe3201
parent 277b7a81bdf4e5c9147dbb430f875c7f80e4e0e1

Fix truncated text in pattern lock setup

Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.

Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.

Bug: 28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916

res/layout/setup_choose_lock_pattern_common.xml

diff --git a/res/layout/setup_choose_lock_pattern_common.xml b/res/layout/setup_choose_lock_pattern_common.xml
index 7e59bbf..20e46f3 100644
--- a/res/layout/setup_choose_lock_pattern_common.xml
+++ b/res/layout/setup_choose_lock_pattern_common.xml
@@ -41,17 +41,16 @@
 
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
-                android:layout_height="0dip"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:minLines="2"
                 android:gravity="center"
-                android:minHeight="50dip"
-                android:textSize="18sp"/>
+                android:textSize="18sp" />
 
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
-                android:layout_weight="4"
-                android:background="@color/lock_pattern_background"/>
+                android:layout_weight="4" />
 
             <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
             <LinearLayout