diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-14 19:59:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 19:59:04 -0700 |
| commit | 6da25703db587c5414df734baf9ac7e5cb504b70 (patch) | |
| tree | c79327df667c3fefc0406dd9b7403c4471139f19 | |
| parent | 904bc3155f06a1b02ac8a5985ac781d8d6dee798 (diff) | |
| parent | 7434a5fbdd5484366a16ec4c15b8374f63236782 (diff) | |
| download | packages_apps_Settings-6da25703db587c5414df734baf9ac7e5cb504b70.zip packages_apps_Settings-6da25703db587c5414df734baf9ac7e5cb504b70.tar.gz packages_apps_Settings-6da25703db587c5414df734baf9ac7e5cb504b70.tar.bz2 | |
Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev
| -rw-r--r-- | res/layout-land/choose_lock_pattern.xml | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml index 588d8da..e178e7c 100644 --- a/res/layout-land/choose_lock_pattern.xml +++ b/res/layout-land/choose_lock_pattern.xml @@ -19,8 +19,7 @@ android:id="@+id/topLayout" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/black"> + android:layout_height="match_parent"> <!-- left side: instructions and messages --> <LinearLayout @@ -43,38 +42,38 @@ android:layout_height="0dip" android:layout_weight="1.0"> - <!-- right / bottom button: confirm or ok --> - <Button android:id="@+id/footerRightButton" - android:layout_height="wrap_content" - android:layout_width="140dip" - android:layout_alignParentBottom="true" + <!-- confirm / restart buttons --> + <LinearLayout android:id="@+id/buttonContainer" + style="@style/SecurityPreferenceButtonContainer" android:layout_centerHorizontal="true" - android:ellipsize="marquee" - android:singleLine="true" - android:drawableRight="@drawable/ic_btn_next" - android:drawablePadding="3dip" - android:text="@string/lockpattern_confirm_button_text"/> + android:layout_alignParentBottom="true" + android:orientation="vertical"> + <!-- left / top button: skip, or re-try --> + <Button android:id="@+id/footerLeftButton" + style="@style/SecurityPreferenceButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/lockpattern_restart_button_text"/> - <!-- left / top button: skip, or re-try --> - <Button android:id="@+id/footerLeftButton" - android:layout_height="wrap_content" - android:layout_width="140dip" - android:layout_above="@id/footerRightButton" - android:layout_centerHorizontal="true" - android:ellipsize="marquee" - android:singleLine="true" - android:text="@string/lockpattern_restart_button_text"/> + <!-- right / bottom button: confirm or ok --> + <Button android:id="@+id/footerRightButton" + style="@style/SecurityPreferenceButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/lockpattern_confirm_button_text"/> + </LinearLayout> <!-- message above buttons --> <TextView android:id="@+id/footerText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_above="@+id/footerLeftButton" + android:layout_above="@+id/buttonContainer" android:layout_centerHorizontal="true" android:layout_marginBottom="4dip" android:textSize="14sp"/> + </RelativeLayout> </LinearLayout> |