commit eecf85e1eba012f6224ad7d47be3880f14d5204a
author Chihhang Chuang <chihhangchuang@google.com> Mon Jun 14 13:48:57 2021 +0800
committer Chihhang Chuang <chihhangchuang@google.com> Tue Jun 15 01:40:18 2021 +0800
tree 17918236f09a81a2e62122cca33a090c196721e6
parent c44abebfe45d55d7c2635aa7bd469d8bc3e42f07

[4/4] Move new picker logic to AOSP

- Remove activity overriden for CustomizationPickerActivity, and use
the activity in WallpaperPicker2.

Bug: 190354625
Test: Build and run the app
Change-Id: I080737f0ec30a6090b1180eba98b3aa8087f50a1
Merged-In: I080737f0ec30a6090b1180eba98b3aa8087f50a1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 68eb4be..4f62429 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
 
+    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
+
     <queries>
         <!-- Specific intents Wallpaper picker query for -->
         <!-- Intent filter with action SET_WALLPAPER -->
@@ -46,17 +48,23 @@
         android:name="com.android.customization.picker.CustomizationPickerApplication"
         android:theme="@style/CustomizationTheme">
         <activity
-            android:name="com.android.customization.picker.CustomizationPickerActivity"
+            android:name="com.android.wallpaper.picker.CustomizationPickerActivity"
             android:label="@string/app_name"
             android:resizeableActivity="false"
-            android:exported="true"
-            android:theme="@style/CustomizationTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.SET_WALLPAPER"/>
+            android:theme="@style/CustomizationTheme.NoActionBar"
+            android:exported="false"/>
 
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
+        <activity-alias
+            android:name="com.android.customization.picker.CustomizationPickerActivity"
+            android:targetActivity="com.android.wallpaper.picker.CustomizationPickerActivity"
+            android:label="@string/app_name"
+            android:exported="true">
+             <intent-filter>
+                 <action android:name="android.intent.action.SET_WALLPAPER"/>
+                 <category android:name="android.intent.category.DEFAULT"/>
+             </intent-filter>
+        </activity-alias>
+
         <activity android:name="com.android.customization.picker.theme.CustomThemeActivity"
                   android:resizeableActivity="false"
                   android:theme="@style/CustomizationTheme.NoActionBar"/>