From 6d431ff08b315081193a6473302ed3060a08adc2 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Fri, 26 Apr 2013 10:19:49 -0700
Subject: am 5ed7c697: (-s ours) Merge "Remove new camera activity code from
 Bryce" into gb-ub-photos-bryce

* commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a':
  Remove new camera activity code from Bryce
---
 AndroidManifest.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d5a5ef9fa..0cdaf991f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -284,6 +284,19 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Gallery.Dialog"/>
 
+        <activity android:name="com.android.camera.NewCameraActivity"
+                android:taskAffinity="com.android.camera.NewCameraActivity"
+                android:theme="@style/Theme.Camera"
+                android:label="@string/camera_label"
+                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.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="com.android.camera.CameraActivity"
                 android:taskAffinity="com.android.camera.CameraActivity"
                 android:label="@string/camera_label"
-- 
cgit v1.2.3