summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-08-14 08:44:07 -0700
committerMangesh Ghiware <mghiware@google.com>2013-08-14 10:01:41 -0700
commitf142f2f0823f08c5d6207066a291449ed90d642f (patch)
treeaa92e5440dc69dfdfe3ee59eaf31764064e6eafe /AndroidManifest.xml
parent389e8c887489db88e9324c17e8d29363198e7221 (diff)
downloadandroid_packages_apps_Gallery2-f142f2f0823f08c5d6207066a291449ed90d642f.zip
android_packages_apps_Gallery2-f142f2f0823f08c5d6207066a291449ed90d642f.tar.gz
android_packages_apps_Gallery2-f142f2f0823f08c5d6207066a291449ed90d642f.tar.bz2
Add a trampoline activity to launch new Camera
This preserves shortcuts, if any, to the Camera activity in the old package name. Bug: 10312966 Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7aee866..4a5da18 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -171,6 +171,21 @@
</intent-filter>
</activity-alias>
+ <!-- This activity acts as a trampoline to the new Camera activity
+ in com.android.camera2 package, so that existing shortcuts
+ are preserved. -->
+ <activity android:name="com.android.camera.CameraActivity"
+ android:icon="@mipmap/ic_launcher_camera"
+ android:label="@string/camera_label"
+ android:theme="@style/android:Theme.NoDisplay" />
+ <activity-alias android:name="com.android.camera.CameraLauncher"
+ android:targetActivity="com.android.camera.CameraActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity-alias>
+
<!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
media from attached MTP devices, like cameras and camera phones -->
<activity android:launchMode="singleInstance"