From 62bbca8320c3861fa9b18a7eab26a42116bef9df Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Thu, 5 Jan 2012 19:23:58 +0800
Subject: Allow saving panorama after the activity is paused. (do not merge)

bug: 5541182
Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
---
 AndroidManifest.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a64093a..ee57c31e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,11 +61,16 @@
                 <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.panorama.PanoramaActivity"
                 android:label="@string/pano_dialog_title"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+                android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
+                android:launchMode="singleTask">
         </activity>
     </application>
 </manifest>
-- 
cgit v1.2.3