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

    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"

        <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" />

        <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

            android:gravity="center"

            android:textSize="14sp"/>

    </LinearLayout>

    </com.android.settings.widget.MatchParentShrinkingLinearLayout>

    <LinearLayout

        style="@style/SecurityPreferenceButtonContainer"