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

* commit '7eb22a907193590d485260982c9215e773c0f904':
  Fix 3395616: Show IME by default when seting/changing password
This commit is contained in:
Jim Miller
2011-01-26 19:07:37 -08:00
committed by Android Git Automerger

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"