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

Merge "Fix 3395616: Show IME by default when seting/changing password" into honeycomb

Browse Source
This commit is contained in:
Jim Miller
2011-01-26 16:25:32 -08:00
committed by Android (Google) Code Review
parent ae3e318812 165bf2fbbf
commit f484f23a53
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -729,7 +729,7 @@
<activity android:name="ConfirmLockPattern"/> <activity android:name="ConfirmLockPattern"/>
<activity android:name="ConfirmLockPassword" <activity android:name="ConfirmLockPassword"
android:windowSoftInputMode="stateUnchanged|adjustResize"/> android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name="ChooseLockGeneric" <activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header"> android:label="@string/lockpassword_choose_lock_generic_header">
@@ -742,7 +742,7 @@
<activity android:name="ChooseLockPattern" android:exported="false"/> <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"/> android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name="ChooseLockPatternTutorial" android:exported="false"/> <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
@@ -1076,7 +1076,7 @@
<activity android:name="com.android.settings.accounts.ChooseAccountActivity" <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
android:label="@string/header_add_an_account" android:label="@string/header_add_an_account"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
<activity android:name=".CryptKeeper" <activity android:name=".CryptKeeper"
android:immersive="true" android:immersive="true"
android:launchMode="singleTop" android:launchMode="singleTop"