summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-03-19 15:42:27 +0800
committerWu-cheng Li <wuchengli@google.com>2012-03-19 15:43:44 +0800
commit0ac559a113c82aa3077acb6c71737efdc52ef409 (patch)
treefcaf7a0c7f98224c37be88d18cefdf971f4eb39f
parentf56d0974690c275fec2f5dc45a17daff4b495ee1 (diff)
downloadandroid_packages_apps_Snap-0ac559a113c82aa3077acb6c71737efdc52ef409.tar.gz
android_packages_apps_Snap-0ac559a113c82aa3077acb6c71737efdc52ef409.tar.bz2
android_packages_apps_Snap-0ac559a113c82aa3077acb6c71737efdc52ef409.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
-rw-r--r--AndroidManifest.xml7
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">