am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb...

* commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a':
  Remove new camera activity code from Bryce

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d5a5ef9..0cdaf99 100644 (file)
--- 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"