Merge Android 12HEADmaster

Bug: 202323961
Merged-In: I5cd8ed57adca2a94eafd78a73a82e3c495846a29
Change-Id: I76f7416e711e5164143de4f0573b6b682d9f4161

1 files changed, 69 insertions, 58 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0f7024..72d721d 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,60 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.wallpaper">
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.wallpaper">
 
   <!-- Custom permission to enforce that only this app can notify the running live wallpaper that
-       the rotating wallpaper image data changed. -->
-  <permission
-      android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"
-      android:protectionLevel="signature"/>
+             the rotating wallpaper image data changed. -->
+  <permission android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"
+       android:protectionLevel="signature"/>
 
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  <uses-permission android:name="android.permission.SET_WALLPAPER" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission
-      android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"/>
 
   <queries>
-    <intent>
-      <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION"/>
-    </intent>
-    <intent>
-      <action android:name="android.service.wallpaper.WallpaperService"/>
-    </intent>
+      <!-- Specific intents Wallpaper picker query for -->
+      <!-- Intent filter with action SET_WALLPAPER -->
+      <intent>
+          <action android:name="android.intent.action.SET_WALLPAPER" />
+      </intent>
+      <!-- Intent filter with action GET_CONTENT and data's mimeType as "image/*" -->
+      <intent>
+          <action android:name="android.intent.action.GET_CONTENT" />
+          <data android:mimeType="image/*" />
+      </intent>
+      <!-- Intent filter with action VIEW -->
+      <intent>
+          <action android:name="android.intent.action.VIEW" />
+      </intent>
+      <!-- Intent filter with action WallpaperService (live wallpaper interface) -->
+      <intent>
+          <action android:name="android.service.wallpaper.WallpaperService" />
+      </intent>
+      <!-- Intent filter with action used to discover partner -->
+      <intent>
+          <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />
+      </intent>
   </queries>
 
   <application
-      tools:replace="android:icon,android:name"
+      tools:replace="android:icon,android:name,android:appComponentFactory"
+      android:appComponentFactory="androidx.core.app.CoreComponentFactory"
       android:allowBackup="true"
       android:icon="@mipmap/product_logo_wallpapers_launcher_color_48"
       android:label="@string/app_name"
       android:name="com.android.wallpaper.picker.WallpapersApplication"
       android:requiredForAllUsers="true"
       android:restoreAnyVersion="true"
-      android:supportsRtl="true"
-      android:extractNativeLibs="false">
+      android:supportsRtl="true">
 
-    <meta-data
-        android:name="com.android.wallpaper.asset.WallpaperGlideModule"
-        android:value="GlideModule" />
+    <meta-data android:name="com.android.wallpaper.asset.WallpaperGlideModule"
+         android:value="GlideModule"/>
 
     <activity android:name="com.android.wallpaper.picker.TopLevelPickerActivity"
+         android:label="@string/app_name"
+         android:theme="@style/WallpaperTheme.NoBackground"
+         android:resizeableActivity="false"
+         android:exported="false">
+    </activity>
+
+    <activity android:name="com.android.wallpaper.picker.CustomizationPickerActivity"
         android:label="@string/app_name"
+        android:resizeableActivity="false"
         android:theme="@style/WallpaperTheme.NoBackground"
-        android:resizeableActivity="false">
-      <intent-filter>
-        <action android:name="android.intent.action.SET_WALLPAPER"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.intent.action.SET_WALLPAPER"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
     </activity>
 
     <activity android:name="com.android.wallpaper.picker.DeepLinkActivity"
-        android:theme="@style/WallpaperTheme.NoBackground">
+        android:theme="@style/WallpaperTheme.NoBackground"
+        android:exported="true">
         <intent-filter android:autoVerify="true">
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
@@ -68,8 +91,9 @@
 
     <activity-alias
         android:name="com.android.wallpaper.picker.CategoryPickerActivity"
-        android:targetActivity="com.android.wallpaper.picker.TopLevelPickerActivity"
-        android:label="@string/app_name">
+        android:targetActivity="com.android.wallpaper.picker.CustomizationPickerActivity"
+        android:label="@string/app_name"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
       </intent-filter>
@@ -83,38 +107,25 @@
     </activity>
 
     <activity android:name="com.android.wallpaper.picker.PreviewActivity"
-        android:resizeableActivity="false"
-        android:theme="@style/WallpaperTheme.Preview">
+         android:resizeableActivity="false"
+         android:theme="@style/WallpaperTheme.Preview">
     </activity>
 
     <activity android:name="com.android.wallpaper.picker.StandalonePreviewActivity"
-        android:resizeableActivity="false"
-        android:theme="@style/WallpaperTheme.Preview">
+         android:resizeableActivity="false"
+         android:theme="@style/WallpaperTheme.Preview"
+         android:exported="true">
       <intent-filter>
-        <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="image/*" />
+        <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <data android:mimeType="image/*"/>
       </intent-filter>
     </activity>
 
     <activity android:name="com.android.wallpaper.picker.ViewOnlyPreviewActivity"
-        android:resizeableActivity="false"
-        android:theme="@style/WallpaperTheme.Preview">
+         android:resizeableActivity="false"
+         android:theme="@style/WallpaperTheme.Preview">
     </activity>
-
-    <service
-        android:name="com.android.wallpaper.module.NoBackupImageWallpaper"
-        android:enabled="@bool/enable_no_backup_image_wallpaper"
-        android:label="@string/no_backup_image_wallpaper_label"
-        android:permission="android.permission.BIND_WALLPAPER"
-        android:process=":live_wallpaper">
-      <intent-filter>
-        <action android:name="android.service.wallpaper.WallpaperService" />
-      </intent-filter>
-      <meta-data
-          android:name="android.service.wallpaper"
-          android:resource="@xml/no_backup_image_wallpaper" />
-    </service>
   </application>
 
 </manifest>