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

* commit 'f484f23a53840cca462264e4a1c607fe02a3f59f':
  Fix 3395616: Show IME by default when seting/changing password
This commit is contained in:
Jim Miller
2011-01-26 16:28:33 -08:00
committed by Android Git Automerger

View File

@@ -729,7 +729,7 @@
<activity android:name="ConfirmLockPattern"/>
<activity android:name="ConfirmLockPassword"
android:windowSoftInputMode="stateUnchanged|adjustResize"/>
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header">
@@ -742,7 +742,7 @@
<activity android:name="ChooseLockPattern" 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"/>