Merge "Ensure text is visible when choosing pattern" into mnc-dev

res/layout/choose_lock_pattern.xml

@@ -21,7 +21,7 @@
     android:layout_height="match_parent">
 
     <!-- takes up all space above button bar at bottom -->
-    <LinearLayout
+    <com.android.settings.widget.MatchParentShrinkingLinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="0dip"
@@ -29,10 +29,11 @@
 
         <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:textSize="18sp"/>
+            android:textSize="18sp" />
 
         <View
              android:background="@*android:drawable/code_lock_top"
@@ -41,8 +42,7 @@
 
         <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
              android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:background="@color/lock_pattern_background" />
+             android:layout_height="match_parent" />
 
         <!-- bottom line looks bad when button bar is their too, omit in this case -->
         <!--View
@@ -57,7 +57,7 @@
             android:gravity="center"
             android:textSize="14sp"/>
 
-    </LinearLayout>
+    </com.android.settings.widget.MatchParentShrinkingLinearLayout>
 
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"