diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-03-13 12:28:02 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2012-03-13 12:28:02 +0800 |
| commit | df7359e6466ae1cee6980663e4cadfb3df06cbbd (patch) | |
| tree | 8879531242a827cfd7ea8d05f75d563eeab80942 | |
| parent | 4f19a07ffe9e0de9e4de775a76e75797f11aa477 (diff) | |
| download | android_packages_apps_Snap-df7359e6466ae1cee6980663e4cadfb3df06cbbd.tar.gz android_packages_apps_Snap-df7359e6466ae1cee6980663e4cadfb3df06cbbd.tar.bz2 android_packages_apps_Snap-df7359e6466ae1cee6980663e4cadfb3df06cbbd.zip | |
Set task affinity for Camera activities.
Bug: 6156475
Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
| -rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 24b3c3b81..04453c926 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -251,6 +251,7 @@ android:theme="@android:style/Theme.Holo.Dialog"/> <activity android:name="com.android.camera.Camera" + android:taskAffinity="com.android.camera" android:label="@string/camera_label" android:theme="@style/ThemeCamera" android:icon="@mipmap/ic_launcher_camera" @@ -273,6 +274,7 @@ </intent-filter> </activity> <activity android:name="com.android.camera.VideoCamera" + android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" android:theme="@style/ThemeCamera" android:configChanges="orientation|screenSize|keyboardHidden" @@ -294,6 +296,7 @@ They can switch to panorama from there. Use singleTask so there will be only one panorama activity. --> <activity android:name="com.android.camera.panorama.PanoramaActivity" + android:taskAffinity="com.android.camera" android:label="@string/pano_dialog_title" android:theme="@style/ThemeCamera" android:configChanges="orientation|screenSize|keyboardHidden" |