diff options
| author | Angus Kong <shkong@google.com> | 2012-01-05 19:23:58 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-01-12 16:26:45 +0800 |
| commit | 62bbca8320c3861fa9b18a7eab26a42116bef9df (patch) | |
| tree | f44480f3db80d35b0dbcb820c69315a7030c76c1 /AndroidManifest.xml | |
| parent | d72992e05197948b7b5bc96146362f6c6c5fcb46 (diff) | |
| download | LegacyCamera-62bbca8320c3861fa9b18a7eab26a42116bef9df.zip LegacyCamera-62bbca8320c3861fa9b18a7eab26a42116bef9df.tar.gz LegacyCamera-62bbca8320c3861fa9b18a7eab26a42116bef9df.tar.bz2 | |
Allow saving panorama after the activity is paused. (do not merge)
bug: 5541182
Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a64093..ee57c31 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> |