diff options
| author | Michael Kolb <kolby@google.com> | 2012-09-10 15:14:56 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2012-09-10 15:14:56 -0700 |
| commit | a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7 (patch) | |
| tree | 3dba6384d38bec9cbe275921ab3f9a6e1c945191 /AndroidManifest.xml | |
| parent | 7108c4078436488ede37608c62a6b953b51db835 (diff) | |
| download | android_packages_apps_Gallery2-a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7.tar.gz android_packages_apps_Gallery2-a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7.tar.bz2 android_packages_apps_Gallery2-a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7.zip | |
Enable new camera UI
Bug: 7139361
Leave both icons in launcher for comparisons
Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e
Diffstat (limited to 'AndroidManifest.xml')
| -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" |