diff options
author | Doris Liu <tianliu@google.com> | 2013-04-26 10:19:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 10:19:49 -0700 |
commit | 6d431ff08b315081193a6473302ed3060a08adc2 (patch) | |
tree | 032ec05e777e6a42a02bbd7f2fbbfafcb7e391bc /AndroidManifest.xml | |
parent | 07d3e4767c4e2d0c12ea1caeded067dfa5fdbf78 (diff) | |
download | android_packages_apps_Snap-6d431ff08b315081193a6473302ed3060a08adc2.tar.gz android_packages_apps_Snap-6d431ff08b315081193a6473302ed3060a08adc2.tar.bz2 android_packages_apps_Snap-6d431ff08b315081193a6473302ed3060a08adc2.zip |
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
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
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" |