From bdc7e2b461064b25b7f17b0941077fc97653093d Mon Sep 17 00:00:00 2001
From: Wei-Ta Chen <weita@google.com>
Date: Tue, 14 Jun 2011 16:53:04 -0700
Subject: Check in the Mosaic Stitching codes.

1. Camera setup moved to activity level.
2. Fixed releasing and acquiring camera process.
3. Unused .xml files removed.
4. Style issues fixed.

Bug: 5031489
Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f
---
 AndroidManifest.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 02bcba31..5e13b605 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <application android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/camera_label"
             android:taskAffinity=""
+            android:theme="@style/ThemeCamera"
             android:hardwareAccelerated="true">
         <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
             <intent-filter>
@@ -28,10 +29,8 @@
         </receiver>
         <activity android:name="com.android.camera.Camera"
                 android:configChanges="orientation|keyboardHidden"
-                android:theme="@style/ThemeCamera"
                 android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
-                android:taskAffinity="android.task.camera"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,10 +50,8 @@
                 android:label="@string/video_camera_label"
                 android:configChanges="orientation|keyboardHidden"
                 android:icon="@mipmap/ic_launcher_video_camera"
-                android:theme="@style/ThemeCamera"
                 android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
-                android:taskAffinity="android.task.camcorder"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.media.action.VIDEO_CAMERA" />
@@ -65,6 +62,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <activity android:name="com.android.camera.panorama.PanoramaActivity"
+                android:configChanges="orientation|keyboardHidden"
+                android:screenOrientation="landscape"
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+        </activity>
     </application>
 </manifest>
 
-- 
cgit v1.2.3