fixup! Settings: wallpaper picker: move to RRO

Author: elpaablo

config/common.mk

@@ -236,7 +236,7 @@ PRODUCT_PACKAGE_OVERLAYS += \
 PRODUCT_PACKAGES += \
     DocumentsUIOverlay \
     NetworkStackOverlay \
-    WallpaperPickerOverlaySettings
+    WallpaperPickerOverlay
 
 # Translations
 CUSTOM_LOCALES += \

overlay/common/packages/apps/Settings/res/values/config.xml

@@ -28,7 +28,12 @@
     <bool name="config_show_mobile_plan">false</bool>
 
     <!-- Whether wallpaper attribution should be shown or not. -->
-    <bool name="config_show_wallpaper_attribution">false</bool>
+    <bool name="config_show_wallpaper_attribution">true</bool>
+
+    <!-- Action name for the styles & wallpaper picker activity. -->
+    <string name="config_styles_and_wallpaper_picker_action" translatable="false">
+      android.intent.action.SET_WALLPAPER
+    </string>
 
     <!-- Whether memory from app_info_settings is available or not. -->
     <bool name="config_show_app_info_settings_memory">true</bool>

overlay/rro_packages/WallpaperPicker/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "WallpaperPickerOverlaySettings",
+    name: "WallpaperPickerOverlay",
     product_specific: true,
 }

overlay/rro_packages/WallpaperPicker/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wallpaper.picker.overlay.settings"
+    package="com.wallpaper.picker.overlay"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.settings" android:priority="1" android:isStatic="true" />

overlay/rro_packages/WallpaperPicker/res/values/config.xml

@@ -6,7 +6,5 @@
     <string name="config_wallpaper_picker_package" translatable="false">com.android.wallpaper</string>
     <!-- Fully-qualified class name for the styles & wallpaper picker activity. -->
     <string name="config_styles_and_wallpaper_picker_class" translatable="false">com.android.customization.picker.CustomizationPickerActivity</string>
-    <!-- Action name for the styles & wallpaper picker activity. -->
-    <string name="config_styles_and_wallpaper_picker_action" translatable="false">android.intent.action.SET_WALLPAPER</string>
 
 </resources>