Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
packages_apps_Gallery2
Commits
2250dfb9
Commit
2250dfb9
authored
13 years ago
by
Chih-Chung Chang
Browse files
Options
Download
Email Patches
Plain Diff
Set task affinity for Camera activities.
Bug: 6156475 Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
parent
a27fc9e1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
AndroidManifest.xml
AndroidManifest.xml
+3
-0
No files found.
AndroidManifest.xml
View file @
2250dfb9
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment