summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-04-25 13:41:12 -0700
committerDoris Liu <tianliu@google.com>2013-04-25 13:56:47 -0700
commit52a069f0839cbc0bff49ea359a497f65d127ef3b (patch)
tree357fa33718f9cde63f8ecb2c11a6a8abf9cf9886 /AndroidManifest.xml
parent2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c (diff)
downloadandroid_packages_apps_Gallery2-52a069f0839cbc0bff49ea359a497f65d127ef3b.zip
android_packages_apps_Gallery2-52a069f0839cbc0bff49ea359a497f65d127ef3b.tar.gz
android_packages_apps_Gallery2-52a069f0839cbc0bff49ea359a497f65d127ef3b.tar.bz2
Remove new camera activity code from Bryce
Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml13
1 files changed, 0 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0cdaf99..d5a5ef9 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"