commit 645cf9fe7f14a05ca4f1e0efbdc0365c5655eee0
author Michael Kolb <kolby@google.com> Mon Sep 10 15:14:56 2012 -0700
committer Michael Kolb <kolby@google.com> Mon Sep 10 15:14:56 2012 -0700
tree efc4c3bbb5e8a167cb9b0a32004223a03e8e940a
parent 3da9ced73a3a56df270664f4ad8aa346b9c6e2cc

Enable new camera UI

  Bug: 7139361

Leave both icons in launcher for comparisons

Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b48af28..3a755cc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -287,6 +287,21 @@
             </intent-filter>
         </activity-alias>
 
+        <activity android:name="com.android.camera.CameraActivity"
+                android:taskAffinity="com.google.android.camera"
+                android:label="@string/camera_label"
+                android:theme="@style/Theme.Camera"
+                android:icon="@drawable/ic_switch_camera_holo_light"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="com.android.camera.VideoCamera"
                 android:taskAffinity="com.android.camera"
                 android:label="@string/video_camera_label"