summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorEmilian Peev <epeevs@codeaurora.org>2014-10-23 11:50:10 +0300
committerEmilian Peev <epeevs@codeaurora.org>2014-10-23 12:40:08 +0300
commit8bb273027b51a63f71c6f88235216ed745d27713 (patch)
tree20c517990630b701209fad5aff85a01489b2969a /AndroidManifest.xml
parentd7810337255f08f3c89e2fb02ca393fc2997ca8d (diff)
downloadandroid_packages_apps_Snap-8bb273027b51a63f71c6f88235216ed745d27713.tar.gz
android_packages_apps_Snap-8bb273027b51a63f71c6f88235216ed745d27713.tar.bz2
android_packages_apps_Snap-8bb273027b51a63f71c6f88235216ed745d27713.zip
Camera: Change activity 'launchMode'
Set 'launchMode' to 'singleTop' instead of the default 'standard'. This will avoid the multiple activity instances that could be triggered during some robustness test scripts. Change-Id: I0948301be4dcb62b7ae962b655447e06c3ee555b
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59de46fe4..b92f8e798 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/snapcam_app_name"
+ android:launchMode="singleTop"
android:logo="@mipmap/ic_launcher_gallery"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
@@ -82,6 +83,7 @@
android:name="com.android.camera.CameraLauncher"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/snapcam_app_name"
+ android:launchMode="singleTop"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -96,6 +98,7 @@
android:name="com.android.camera.VideoCamera"
android:icon="@mipmap/ic_launcher_video_camera"
android:label="@string/video_camera_label"
+ android:launchMode="singleTop"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.media.action.VIDEO_CAMERA" />
@@ -114,6 +117,7 @@
android:excludeFromRecents="true"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/snapcam_app_name"
+ android:launchMode="singleTop"
android:logo="@mipmap/ic_launcher_gallery"
android:taskAffinity="com.android.camera.SecureCameraActivity"
android:theme="@style/Theme.Camera"