Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aa44309 authored by Chih-Chung Chang's avatar Chih-Chung Chang Committed by Android (Google) Code Review
Browse files

Merge "Set task affinity for Camera activities."

parents d5617d5d 2250dfb9

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -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"