commit e2c557d4c0fb81496a0429fb32fe033b2e769611
author Roy West <rwest@android.com> Wed Jan 26 16:34:40 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 26 16:34:40 2011 -0800
tree 41b50c93639dbafeb539eb51c8fc3505462b304c
parent f484f23a53840cca462264e4a1c607fe02a3f59f
parent cbebe591d7b55b916a753987e87f69524218875e

Merge "Fix build; dumb syntax error." into honeycomb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 334a9d9..1ef8a46 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"/>
 
@@ -1076,7 +1076,7 @@
         <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
             android:label="@string/header_add_an_account"
             android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
-            
+
         <activity android:name=".CryptKeeper"
                   android:immersive="true"
                   android:launchMode="singleTop"