From 3283e049aa080c375457de46bbf180a88899228a Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 26 Jun 2009 11:59:58 -0700
Subject: Solve task flow problems in Camera and Camcorder.

1. Let "Camera" and "Camcorder" use the same task affinity, so that there
   will only one task stack in the system.

2. Finish the "Camera" or "Camcorder" activity, when switch to the other,
   so that it works like the same activity.
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16fc105a..5977ee1b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,7 @@
                 android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
                 android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
-                android:taskAffinity="android.task.videocamera">
+                android:taskAffinity="android.task.camera">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
-- 
cgit v1.2.3