diff options
| author | Jim Miller <jaggies@google.com> | 2011-04-15 18:52:31 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-04-15 18:52:31 -0700 |
| commit | 74b1e0a7330af195621ad0965748bee66c46f4b6 (patch) | |
| tree | 5f4c959ca923b1cc7fe08cd30aa8957292387955 /res/layout-land | |
| parent | 2c701570ebfbccc5a6a2ed271c965f75ed2149f0 (diff) | |
| download | packages_apps_Settings-74b1e0a7330af195621ad0965748bee66c46f4b6.zip packages_apps_Settings-74b1e0a7330af195621ad0965748bee66c46f4b6.tar.gz packages_apps_Settings-74b1e0a7330af195621ad0965748bee66c46f4b6.tar.bz2 | |
Fix 4283049: Restore continue/cancel buttons in LockScreen Settings
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.
The change also includes a minor change to enable using the IME enter
key to proceed to the next step.
Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/choose_lock_password.xml | 42 | ||||
| -rw-r--r-- | res/layout-land/confirm_lock_password.xml | 1 |
2 files changed, 18 insertions, 25 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml index 10a01c7..005dd63 100644 --- a/res/layout-land/choose_lock_password.xml +++ b/res/layout-land/choose_lock_password.xml @@ -58,15 +58,10 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" + android:imeOptions="actionNext|flagNoEnterAction" /> </LinearLayout> - <!-- Spacer between password entry and keyboard --> - <View - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" /> - <!-- Alphanumeric keyboard --> <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" android:layout_alignParentBottom="true" @@ -78,29 +73,26 @@ /> <RelativeLayout - android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="@android:drawable/bottom_bar" - android:visibility="gone"> + android:layout_height="0dip" + android:layout_weight="1"> + <LinearLayout + style="@style/SecurityPreferenceButtonContainer" + android:orientation="horizontal" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true"> - <Button android:id="@+id/cancel_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:layout_alignParentLeft="true" - android:text="@string/lockpassword_cancel_label" - /> + <!-- left : cancel --> + <Button android:id="@+id/cancel_button" + style="@style/SecurityPreferenceButton" + android:text="@string/lockpassword_cancel_label"/> - <Button android:id="@+id/next_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:layout_alignParentRight="true" - android:drawableRight="@drawable/ic_btn_next" - android:drawablePadding="10dip" - android:text="@string/lockpassword_continue_label" - /> + <!-- right : continue --> + <Button android:id="@+id/next_button" + style="@style/SecurityPreferenceButton" + android:text="@string/lockpassword_continue_label"/> + </LinearLayout> </RelativeLayout> </LinearLayout> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml index 4138be1..e5580eb 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -59,6 +59,7 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" + android:imeOptions="actionNext|flagNoEnterAction" /> </LinearLayout> |