summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
author Shubhi Saxena <shubhisaxena@google.com> 2022-10-25 12:01:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-10-25 12:01:42 +0000
commitc20fadc264ad24b7d102dee18abb7ed1469d1dfd (patch)
tree3ef47f85c5a1bc6af2a64ebcb444b8e22b74371a /AndroidManifest.xml
parent23d64fbd0a27d41f8fccf5aa04aeecd1ff16c929 (diff)
parent6e7b758ae89729d70af7aa14778e90550c23ba9c (diff)
Merge "Add Photo Picker Settings activity" into tm-mainline-prod
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 279d2e9c1..a369c3c5d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -185,6 +185,14 @@
</intent-filter>
</activity>
+ <activity
+ android:name="com.android.providers.media.photopicker.PhotoPickerSettingsActivity"
+ android:theme="@style/PickerSettingsTheme"
+ android:process=":PhotoPicker"
+ android:excludeFromRecents="true"
+ android:exported="true"
+ android:enabled="false" />
+
<activity-alias
android:name="com.android.providers.media.photopicker.PhotoPickerGetContentActivity"
android:targetActivity="com.android.providers.media.photopicker.PhotoPickerActivity"