Commit 2250dfb9 authored by Chih-Chung Chang's avatar Chih-Chung Chang
Browse files

Set task affinity for Camera activities.

Bug: 6156475
Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
parent a27fc9e1
...@@ -251,6 +251,7 @@ ...@@ -251,6 +251,7 @@
android:theme="@android:style/Theme.Holo.Dialog"/> android:theme="@android:style/Theme.Holo.Dialog"/>
<activity android:name="com.android.camera.Camera" <activity android:name="com.android.camera.Camera"
android:taskAffinity="com.android.camera"
android:label="@string/camera_label" android:label="@string/camera_label"
android:theme="@style/ThemeCamera" android:theme="@style/ThemeCamera"
android:icon="@mipmap/ic_launcher_camera" android:icon="@mipmap/ic_launcher_camera"
...@@ -273,6 +274,7 @@ ...@@ -273,6 +274,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.android.camera.VideoCamera" <activity android:name="com.android.camera.VideoCamera"
android:taskAffinity="com.android.camera"
android:label="@string/video_camera_label" android:label="@string/video_camera_label"
android:theme="@style/ThemeCamera" android:theme="@style/ThemeCamera"
android:configChanges="orientation|screenSize|keyboardHidden" android:configChanges="orientation|screenSize|keyboardHidden"
...@@ -294,6 +296,7 @@ ...@@ -294,6 +296,7 @@
They can switch to panorama from there. Use singleTask so there They can switch to panorama from there. Use singleTask so there
will be only one panorama activity. --> will be only one panorama activity. -->
<activity android:name="com.android.camera.panorama.PanoramaActivity" <activity android:name="com.android.camera.panorama.PanoramaActivity"
android:taskAffinity="com.android.camera"
android:label="@string/pano_dialog_title" android:label="@string/pano_dialog_title"
android:theme="@style/ThemeCamera" android:theme="@style/ThemeCamera"
android:configChanges="orientation|screenSize|keyboardHidden" android:configChanges="orientation|screenSize|keyboardHidden"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment