Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev am: 8b649c0558

am: b0df332c35

* commit 'b0df332c35407f0c73122e6f985336aa54b16e3b':
  Fix truncated text in pattern lock setup

Change-Id: I63f1716713f8cf0766d47f3fef5c685b089be23c
This commit is contained in:
Maurice Lam
2016-05-11 21:52:12 +00:00
committed by android-build-merger

View File

@@ -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