diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-01-25 17:42:09 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-01-25 17:51:18 +0800 |
| commit | 75c11984594546002610c9f076520414ae4b6d4d (patch) | |
| tree | 74c29a933ca2cbaf34f8f3d4be292f1472c54cfd /AndroidManifest.xml | |
| parent | b5aaedd0e300f103f73907ec9bdfcc6b1231eef3 (diff) | |
| download | LegacyCamera-75c11984594546002610c9f076520414ae4b6d4d.zip LegacyCamera-75c11984594546002610c9f076520414ae4b6d4d.tar.gz LegacyCamera-75c11984594546002610c9f076520414ae4b6d4d.tar.bz2 | |
Fix NPE in BasicSettingPopup.
The monkey test sends DPAD_CENTER event and brings up the soft
keyboard. The layout will change and the basic setting popup
may have fewer children than items. In fact, setActiviated is
called by ListView and we do not need to call it.
Also add stateAlwaysHidden to make sure soft keyboard is always
hidden.
bug:3383128
Change-Id: I8032ff4680af7617c1568632af1c1678a04a04f8
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6cba728..23ede92 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -30,7 +30,8 @@ android:theme="@style/ThemeCamera" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" - android:taskAffinity="android.task.camera"> + android:taskAffinity="android.task.camera" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -52,7 +53,8 @@ android:theme="@style/ThemeCamera" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" - android:taskAffinity="android.task.camcorder"> + android:taskAffinity="android.task.camcorder" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> <action android:name="android.media.action.VIDEO_CAMERA" /> <category android:name="android.intent.category.DEFAULT" /> |