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

Fix 3298889: Show continue button on PIN and password screens

Browse Source 
This fixes the above bug by allowing the PIN and password
screens to shrink to reveal the continue/cancel buttons
when the IME is shown.

This also fixes a minor resource bug where the title was
showing "confirm your password/pin" instead of "choose your password/pin".

Change-Id: I610c6018085e0c4ef1b6dc384566d06d1211f8ea
This commit is contained in:
Jim Miller
2011-01-10 18:24:11 -08:00
parent 9391b9545f
commit d75905991c
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -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"/>

2
res/layout-xlarge-land/choose_lock_password.xml
View File

@@ -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" -->

2
res/layout-xlarge-land/confirm_lock_password.xml
View File

@@ -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" -->

4
src/com/android/settings/ChooseLockPassword.java
View File

@@ -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);
}