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

Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev

Browse Source
This commit is contained in:
Jim Miller
2012-05-14 19:59:04 -07:00
committed by Android (Google) Code Review
parent 904bc3155f 7434a5fbdd
commit 6da25703db
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
res/layout-land/choose_lock_pattern.xml
View File

@@ -19,8 +19,7 @@
android:id="@+id/topLayout" android:id="@+id/topLayout"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/black">
<!-- left side: instructions and messages --> <!-- left side: instructions and messages -->
<LinearLayout <LinearLayout
@@ -43,38 +42,38 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0"> android:layout_weight="1.0">
<!-- right / bottom button: confirm or ok --> <!-- confirm / restart buttons -->
<Button android:id="@+id/footerRightButton" <LinearLayout android:id="@+id/buttonContainer"
android:layout_height="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_width="140dip" android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:orientation="vertical">
android:ellipsize="marquee"
android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip"
android:text="@string/lockpattern_confirm_button_text"/>
<!-- 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 --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerRightButton"
android:layout_height="wrap_content" style="@style/SecurityPreferenceButton"
android:layout_width="140dip" android:layout_width="match_parent"
android:layout_above="@id/footerRightButton" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:text="@string/lockpattern_confirm_button_text"/>
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/>
</LinearLayout>
<!-- message above buttons --> <!-- message above buttons -->
<TextView android:id="@+id/footerText" <TextView android:id="@+id/footerText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/footerLeftButton" android:layout_above="@+id/buttonContainer"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:textSize="14sp"/> android:textSize="14sp"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>