From 5320ee47672ca9936959d6e765149eb22fef9c6f Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Mon, 19 Mar 2012 15:42:27 +0800
Subject: 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
---
 AndroidManifest.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'AndroidManifest.xml')

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">
-- 
cgit v1.2.3