diff options
| author | Xiyuan Xia <xiyuan@google.com> | 2015-05-20 14:26:15 -0700 |
|---|---|---|
| committer | Xiyuan Xia <xiyuan@google.com> | 2015-05-20 14:43:36 -0700 |
| commit | 4a8edaf8b0b2f9313739ad434c3f409ac037f990 (patch) | |
| tree | f7b463647c74229df01bf33baffde005852f1737 /AndroidManifest.xml | |
| parent | b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232 (diff) | |
| download | packages_apps_Settings-4a8edaf8b0b2f9313739ad434c3f409ac037f990.zip packages_apps_Settings-4a8edaf8b0b2f9313739ad434c3f409ac037f990.tar.gz packages_apps_Settings-4a8edaf8b0b2f9313739ad434c3f409ac037f990.tar.bz2 | |
Do not show soft keyboard when locked out
- Remove stateVisible for ConfirmLockPassword activity so that
soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
activity window gains focus;
Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6fd534c..d8d1736 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1407,7 +1407,7 @@ android:theme="@style/Theme.ConfirmDeviceCredentials"/> <activity android:name="ConfirmLockPassword" - android:windowSoftInputMode="stateVisible|adjustResize" + android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.ConfirmDeviceCredentials"/> <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/> @@ -1424,7 +1424,7 @@ <!-- Note this must not be exported since it returns the password in the intent --> <activity android:name="ConfirmLockPassword$InternalActivity" android:exported="false" - android:windowSoftInputMode="stateVisible|adjustResize" + android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.ConfirmDeviceCredentials"/> <activity android:name="SetupChooseLockGeneric" |