Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
This commit is contained in:
@@ -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
|
||||||
|
Reference in New Issue
Block a user