summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-09-16 17:16:25 -0700
committerMichael Kolb <kolby@google.com>2012-09-17 09:33:44 -0700
commitaa5b0e41a6d61b2806f3bbffc89c70fa308ddd3b (patch)
tree7d11869b3d71c22c8707ca3c9cc09bb1897b3592 /AndroidManifest.xml
parent36a1062a8a6bca02b1238ae3d22673112e1930c9 (diff)
downloadandroid_packages_apps_Snap-aa5b0e41a6d61b2806f3bbffc89c70fa308ddd3b.tar.gz
android_packages_apps_Snap-aa5b0e41a6d61b2806f3bbffc89c70fa308ddd3b.tar.bz2
android_packages_apps_Snap-aa5b0e41a6d61b2806f3bbffc89c70fa308ddd3b.zip
Fix manifest to launch correct activity
Bug: 7175368 Change task affinity to launch correct camera activity Change-Id: I6bd22a8b64317a8e37f4c13ebf374465096662e7
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab35ad49f..b2c6c72ff 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -260,7 +260,7 @@
<!-- Icon sourced from www.raadius.deviantart.com/art/Aeolus-HD-200984118 -->
<activity android:name="com.android.camera.Camera"
- android:taskAffinity="com.android.camera"
+ android:taskAffinity="com.android.camera.Camera"
android:label="@string/camera_label"
android:theme="@style/Theme.Camera"
android:icon="@drawable/ic_switch_camera_holo_light"
@@ -275,7 +275,7 @@
</activity>
<activity android:name="com.android.camera.CameraActivity"
- android:taskAffinity="com.google.android.camera"
+ android:taskAffinity="com.android.camera.CameraActivity"
android:label="@string/camera_label"
android:theme="@style/Theme.Camera"
android:icon="@mipmap/ic_launcher_camera"