From bc0032890e7cc6f71ca42ae207c849a1cb2645c8 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 17 Aug 2022 21:34:16 -0400 Subject: [PATCH] Add patches for ThemePicker --- ...0001-Add-wallpaper-privapp-whitelist.patch | 65 ++++++++++++++ ...-Override-legacy-WallpaperPicker-app.patch | 26 ++++++ ...03-Add-wallpaper-default-permissions.patch | 87 +++++++++++++++++++ ...-we-read-and-write-launcher-settings.patch | 27 ++++++ ...re-HOME-query-for-launcher-discovery.patch | 33 +++++++ ...ssion-for-launcher-preview-rendering.patch | 38 ++++++++ 6 files changed, 276 insertions(+) create mode 100644 packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch create mode 100644 packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch create mode 100644 packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch create mode 100644 packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch create mode 100644 packages/apps/ThemePicker/0005-Declare-HOME-query-for-launcher-discovery.patch create mode 100644 packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch diff --git a/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch new file mode 100644 index 0000000..3d44d83 --- /dev/null +++ b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch @@ -0,0 +1,65 @@ +From d043802a9e21a05b3fda0d2c3c41a69e513248e0 Mon Sep 17 00:00:00 2001 +From: Luca Stefani +Date: Fri, 1 Nov 2019 21:14:29 +0100 +Subject: [PATCH 1/6] Add wallpaper privapp whitelist + +Change-Id: I044b1d9201ac0b8780fc37a387f401f3dd0ddeac +--- + Android.bp | 10 +++++++++ + privapp_whitelist_com.android.wallpaper.xml | 24 +++++++++++++++++++++ + 2 files changed, 34 insertions(+) + create mode 100644 privapp_whitelist_com.android.wallpaper.xml + +diff --git a/Android.bp b/Android.bp +index c85fd2b..5c1f487 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -104,5 +104,15 @@ android_app { + platform_apis: true, + manifest: "AndroidManifest.xml", + additional_manifests: [":WallpaperPicker2_Manifest"], ++ ++ required: ["privapp_whitelist_com.android.wallpaper.xml"], + overrides: ["WallpaperPicker2"], + } ++ ++prebuilt_etc_xml { ++ name: "privapp_whitelist_com.android.wallpaper.xml", ++ src: "privapp_whitelist_com.android.wallpaper.xml", ++ system_ext_specific: true, ++ filename_from_src: true, ++ sub_dir: "permissions", ++} +diff --git a/privapp_whitelist_com.android.wallpaper.xml b/privapp_whitelist_com.android.wallpaper.xml +new file mode 100644 +index 0000000..e3f3b65 +--- /dev/null ++++ b/privapp_whitelist_com.android.wallpaper.xml +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.37.2 + diff --git a/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch b/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch new file mode 100644 index 0000000..c5debb0 --- /dev/null +++ b/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch @@ -0,0 +1,26 @@ +From 5a3e22296f8de9fa21140cf28f622875928ba8ca Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 5 Oct 2021 19:00:36 -0700 +Subject: [PATCH 2/6] Override legacy WallpaperPicker app + +Change-Id: I9a1907527eea0e8e7cd10bab64ba79c2c4006c59 +--- + Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Android.bp b/Android.bp +index 5c1f487..ce850c5 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -106,7 +106,7 @@ android_app { + additional_manifests: [":WallpaperPicker2_Manifest"], + + required: ["privapp_whitelist_com.android.wallpaper.xml"], +- overrides: ["WallpaperPicker2"], ++ overrides: ["WallpaperPicker2", "WallpaperPicker"], + } + + prebuilt_etc_xml { +-- +2.37.2 + diff --git a/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch b/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch new file mode 100644 index 0000000..4d6e336 --- /dev/null +++ b/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch @@ -0,0 +1,87 @@ +From 75de47c866b31a8930bc7e58954928712dbcbe60 Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Tue, 15 Sep 2020 03:27:19 +0200 +Subject: [PATCH 3/6] Add wallpaper default permissions + +Change-Id: If43a594da31fbab9280ce45b049737f6c534b620 +--- + Android.bp | 14 ++++++- + default_permissions_com.android.wallpaper.xml | 37 +++++++++++++++++++ + 2 files changed, 50 insertions(+), 1 deletion(-) + create mode 100644 default_permissions_com.android.wallpaper.xml + +diff --git a/Android.bp b/Android.bp +index ce850c5..8ad98d2 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -105,7 +105,11 @@ android_app { + manifest: "AndroidManifest.xml", + additional_manifests: [":WallpaperPicker2_Manifest"], + +- required: ["privapp_whitelist_com.android.wallpaper.xml"], ++ required: [ ++ "privapp_whitelist_com.android.wallpaper.xml", ++ "default_permissions_com.android.wallpaper.xml", ++ ], ++ + overrides: ["WallpaperPicker2", "WallpaperPicker"], + } + +@@ -116,3 +120,11 @@ prebuilt_etc_xml { + filename_from_src: true, + sub_dir: "permissions", + } ++ ++prebuilt_etc_xml { ++ name: "default_permissions_com.android.wallpaper.xml", ++ src: "default_permissions_com.android.wallpaper.xml", ++ system_ext_specific: true, ++ filename_from_src: true, ++ sub_dir: "default-permissions", ++} +diff --git a/default_permissions_com.android.wallpaper.xml b/default_permissions_com.android.wallpaper.xml +new file mode 100644 +index 0000000..41b23ce +--- /dev/null ++++ b/default_permissions_com.android.wallpaper.xml +@@ -0,0 +1,37 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.37.2 + diff --git a/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch b/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch new file mode 100644 index 0000000..8f359c6 --- /dev/null +++ b/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch @@ -0,0 +1,27 @@ +From 0d59123442f547d1d3cbd5e4200d6f2ec6d4bed0 Mon Sep 17 00:00:00 2001 +From: Luca Stefani +Date: Fri, 1 Nov 2019 23:17:08 +0100 +Subject: [PATCH 4/6] Specify we read and write launcher settings + +Change-Id: Ifc8196588443b007602118389ca76d34ab531f14 +--- + AndroidManifest.xml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/AndroidManifest.xml b/AndroidManifest.xml +index ff8f187..cace7db 100755 +--- a/AndroidManifest.xml ++++ b/AndroidManifest.xml +@@ -37,6 +37,9 @@ + + + ++ ++ ++ + +Date: Tue, 5 Oct 2021 19:12:40 -0700 +Subject: [PATCH 5/6] Declare HOME query for launcher discovery + +ThemePicker needs to query the current launcher in order to render +launcher/wallpaper previews, toggle themed icons, and change the app +grid size. + +Change-Id: Id79fe1eaa4d09f775a37a1dfb1091ed08a1d3422 +--- + AndroidManifest.xml | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/AndroidManifest.xml b/AndroidManifest.xml +index cace7db..85bf749 100755 +--- a/AndroidManifest.xml ++++ b/AndroidManifest.xml +@@ -35,6 +35,11 @@ + + + ++ ++ ++ ++ ++ + + + +-- +2.37.2 + diff --git a/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch b/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch new file mode 100644 index 0000000..a1afdd2 --- /dev/null +++ b/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch @@ -0,0 +1,38 @@ +From b7867190ba594edc894d3833746c5af07ad596af Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 5 Oct 2021 22:40:58 -0700 +Subject: [PATCH 6/6] Add permission for launcher preview rendering + +Change-Id: Ie707dcd98161e8f5993b0504295fddc3f395cd20 +--- + AndroidManifest.xml | 1 + + privapp_whitelist_com.android.wallpaper.xml | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/AndroidManifest.xml b/AndroidManifest.xml +index 85bf749..897a21f 100755 +--- a/AndroidManifest.xml ++++ b/AndroidManifest.xml +@@ -8,6 +8,7 @@ + + + ++ + + + +diff --git a/privapp_whitelist_com.android.wallpaper.xml b/privapp_whitelist_com.android.wallpaper.xml +index e3f3b65..5dee99b 100644 +--- a/privapp_whitelist_com.android.wallpaper.xml ++++ b/privapp_whitelist_com.android.wallpaper.xml +@@ -17,6 +17,7 @@ + + + ++ + + + +-- +2.37.2 +