diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-11 13:50:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-11 13:50:40 -0800 |
| commit | 7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e (patch) | |
| tree | 5dafb93f9b858f464b8a201b2b70b70878534c3f | |
| parent | 31a071432ee036c828b8df67a6d33f438d7efe5f (diff) | |
| parent | d75905991c5a1783ca27dc188c2d086f8f13ff94 (diff) | |
| download | packages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.zip packages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.tar.gz packages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.tar.bz2 | |
Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | res/layout-xlarge-land/choose_lock_password.xml | 2 | ||||
| -rw-r--r-- | res/layout-xlarge-land/confirm_lock_password.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockPassword.java | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ce70f87..17c2fcd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -714,7 +714,8 @@ <!-- Lock screen settings --> <activity android:name="ConfirmLockPattern"/> - <activity android:name="ConfirmLockPassword"/> + <activity android:name="ConfirmLockPassword" + android:windowSoftInputMode="stateUnchanged|adjustResize"/> <activity android:name="ChooseLockGeneric" android:label="@string/lockpassword_choose_lock_generic_header"> @@ -726,7 +727,8 @@ <activity android:name="ChooseLockPattern" android:exported="false"/> - <activity android:name="ChooseLockPassword" android:exported="false"/> + <activity android:name="ChooseLockPassword" android:exported="false" + android:windowSoftInputMode="stateUnchanged|adjustResize"/> <activity android:name="ChooseLockPatternTutorial" android:exported="false"/> diff --git a/res/layout-xlarge-land/choose_lock_password.xml b/res/layout-xlarge-land/choose_lock_password.xml index 5f7cfaf..586e7d5 100644 --- a/res/layout-xlarge-land/choose_lock_password.xml +++ b/res/layout-xlarge-land/choose_lock_password.xml @@ -25,7 +25,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="72dip" + android:layout_marginTop="20dip" android:orientation="horizontal"> <!-- "Enter PIN(Password) to unlock" --> diff --git a/res/layout-xlarge-land/confirm_lock_password.xml b/res/layout-xlarge-land/confirm_lock_password.xml index d03923e..7ae8944 100644 --- a/res/layout-xlarge-land/confirm_lock_password.xml +++ b/res/layout-xlarge-land/confirm_lock_password.xml @@ -26,7 +26,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="72dip" + android:layout_marginTop="20dip" android:orientation="horizontal"> <!-- "Enter PIN(Password) to unlock" --> diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index b8db82e..1bebebb 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -218,8 +218,8 @@ public class ChooseLockPassword extends PreferenceActivity { // Update the breadcrumb (title) if this is embedded in a PreferenceActivity if (activity instanceof PreferenceActivity) { final PreferenceActivity preferenceActivity = (PreferenceActivity) activity; - int id = mIsAlphaMode ? R.string.lockpassword_confirm_your_password_header - : R.string.lockpassword_confirm_your_pin_header; + int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header + : R.string.lockpassword_choose_your_pin_header; CharSequence title = getText(id); preferenceActivity.showBreadCrumbs(title, title); } |