Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev

am: 8b649c0558

* commit '8b649c055859e9d67353980aaf1dd2c62bdcfe06':
  Fix truncated text in pattern lock setup

Change-Id: I22db81a7c6ff572d0ebeb7998392da82d98234d2
This commit is contained in:
Maurice Lam
2016-05-11 20:14:58 +00:00
committed by android-build-merger

View File

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