From 52a069f0839cbc0bff49ea359a497f65d127ef3b Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 25 Apr 2013 13:41:12 -0700
Subject: Remove new camera activity code from Bryce

Bug: 8722017
Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
---
 AndroidManifest.xml | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0cdaf991f..d5a5ef9fa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -284,19 +284,6 @@
                 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