summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 2022-08-11 14:35:19 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 2022-08-11 14:35:19 +0000
commit2622e5aded3266aeca43146d8b22403720ef9eb1 (patch)
tree00f77d60b9245fc3bb5e6258eb5828c0fe2d42fc /AndroidManifest.xml
parent8b89877633cef0e18ce43dd305090e569b058954 (diff)
parentc52b46825ffddd2ed23197dd29ab8b7f7454d4be (diff)
[automerge] Update MediaProvider's icon to gallery icon 2p: c52b46825f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19595489 Bug: 241801552 Bug: 234205671 Bug: 238755399 Change-Id: Ie91b69ac3ff5e5c9d1252a4f854b9fd8cd4487c4
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2d9b3d07..f98257e58 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,9 +49,13 @@
<permission android:name="com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS"
android:protectionLevel="signature" />
+ <!-- We use Photo Picker app icon for this package. It is necessary for Photo Picker GET_CONTENT
+ take over. Some apps query packages that can handle GET_CONTENT and want to display the
+ icon and label of the package to the user. -->
<application
android:name="com.android.providers.media.MediaApplication"
android:label="@string/app_label"
+ android:icon="@mipmap/picker_app_icon"
android:allowBackup="false"
android:supportsRtl="true"
android:forceQueryable="true"
@@ -166,7 +170,6 @@
android:name="com.android.providers.media.photopicker.PhotoPickerActivity"
android:process=":PhotoPicker"
android:label="@string/picker_app_label"
- android:icon="@mipmap/picker_app_icon"
android:theme="@style/PickerDefaultTheme"
android:exported="true"
android:excludeFromRecents="true"