diff options
| author | Michael Kolb <kolby@google.com> | 2012-09-10 18:57:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 18:57:47 -0700 |
| commit | e5f22a35b87bb7178a1421f573731590e5f68048 (patch) | |
| tree | 65fdb1cee9cb7b96f642636fe8702396f388926a | |
| parent | 8b092bce0716e5f53d53dc9f9be2e7c9978d685c (diff) | |
| parent | a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7 (diff) | |
| download | android_packages_apps_Gallery2-e5f22a35b87bb7178a1421f573731590e5f68048.tar.gz android_packages_apps_Gallery2-e5f22a35b87bb7178a1421f573731590e5f68048.tar.bz2 android_packages_apps_Gallery2-e5f22a35b87bb7178a1421f573731590e5f68048.zip | |
Merge "Enable new camera UI" into gb-ub-photos-arches
| -rw-r--r-- | AndroidManifest.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b48af2890..3a755ccb5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -287,6 +287,21 @@ </intent-filter> </activity-alias> + <activity android:name="com.android.camera.CameraActivity" + android:taskAffinity="com.google.android.camera" + android:label="@string/camera_label" + android:theme="@style/Theme.Camera" + android:icon="@drawable/ic_switch_camera_holo_light" + 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.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" |