PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 353cdee69e

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I470a2267b051eb394ed95f9c7443786fbf911836
This commit is contained in:
Maurice Lam
2016-05-11 18:15:35 +00:00
committed by android-build-merger
parent 3b533b98da 353cdee69e
commit 96aaeafa91
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/setup_choose_lock_pattern_common.xml
View File

@@ -21,6 +21,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/setup_choose_lock_pattern_template"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwHeaderText="@string/wifi_setup_wizard_title"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
@@ -43,11 +44,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:minHeight="50dip"
android:textSize="18sp"/>
android:textSize="18sp" />
<Button android:id="@+id/retryButton"
style="@android:style/Widget.Material.Button.Borderless.Colored"
@@ -59,8 +60,7 @@
<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" />
</LinearLayout>