diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-03-19 15:42:27 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-03-19 15:43:44 +0800 |
| commit | 5320ee47672ca9936959d6e765149eb22fef9c6f (patch) | |
| tree | 9a22d49d7f97a6c803e628eb92d0a6d01b247f77 /AndroidManifest.xml | |
| parent | e63419969925c1e17a0415cde139d5117bf1fa86 (diff) | |
| download | android_packages_apps_Gallery2-5320ee47672ca9936959d6e765149eb22fef9c6f.tar.gz android_packages_apps_Gallery2-5320ee47672ca9936959d6e765149eb22fef9c6f.tar.bz2 android_packages_apps_Gallery2-5320ee47672ca9936959d6e765149eb22fef9c6f.zip | |
Remove singleTask mode of panorama.
Camera, VideoCamera, PanoramaActivity will be combined to
reduce the latency. singleTask should be removed to
achieve that.
bug:5954389
Change-Id: Ic79f59baffd24669910d1f05b65865788803b79c
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f51a685b7..697c483cf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -291,10 +291,6 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> - <!-- Suppose users enter panorama from launcher, turn off the screen, - turn on the screen, and enter the camera from the lock screen. - They can switch to panorama from there. Use singleTask so there - will be only one panorama activity. --> <activity android:name="com.android.camera.PanoramaActivity" android:taskAffinity="com.android.camera" android:label="@string/pano_dialog_title" @@ -302,8 +298,7 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:screenOrientation="behind" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan" - android:launchMode="singleTask"> + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> </activity> <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider" android:label="@string/appwidget_title"> |