From e46a1e1b2e480553719be758c48ff3ef6080e0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aruna=20=7C=20=E0=B6=85=E0=B6=BB=E0=B7=94=E0=B6=AB?= Date: Tue, 22 Oct 2024 12:37:16 -0400 Subject: [PATCH] sync with ponces --- ...Lockscreen-Weather-with-OmniJaws-2-2.patch | 9 ++-- ...rect-category-and-styling-for-google.patch | 43 +++++++++++++++++++ ...-added.patch => 0003-gsi-info-added.patch} | 0 3 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 patches/personal/platform_packages_apps_Settings/0002-Settings-Set-correct-category-and-styling-for-google.patch rename patches/personal/platform_packages_apps_Settings/{0001-gsi-info-added.patch => 0003-gsi-info-added.patch} (100%) diff --git a/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch b/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch index 672945a..f8c51c9 100644 --- a/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch +++ b/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch @@ -1,7 +1,7 @@ -From 2bf82017a069a3f440919cbc1dee8d24911d3d13 Mon Sep 17 00:00:00 2001 +From 1a91e1f8b1b6d3a4114363eda168a9c78548d78d Mon Sep 17 00:00:00 2001 From: Alberto Ponces Date: Sun, 12 Nov 2023 11:24:17 +0000 -Subject: [PATCH] feat: Add Lockscreen Weather with OmniJaws (2/2) +Subject: [PATCH 1/2] feat: Add Lockscreen Weather with OmniJaws (2/2) Based on OmniROM's implementation, updated by @maxwen and adapted by @neobuddy89. @@ -17,10 +17,10 @@ Co-authored-by: Pranav Vashi create mode 100644 src/com/android/settings/omnijaws/LockScreenWeatherPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index f92fd2a..39e8134 100644 +index 866acda..dc506de 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -12411,6 +12411,11 @@ +@@ -12415,6 +12415,11 @@ %1$s, %2$s @@ -205,4 +205,3 @@ index 2e4a1f2..499fc2c 100644 } -- 2.34.1 - diff --git a/patches/personal/platform_packages_apps_Settings/0002-Settings-Set-correct-category-and-styling-for-google.patch b/patches/personal/platform_packages_apps_Settings/0002-Settings-Set-correct-category-and-styling-for-google.patch new file mode 100644 index 0000000..55ecbc0 --- /dev/null +++ b/patches/personal/platform_packages_apps_Settings/0002-Settings-Set-correct-category-and-styling-for-google.patch @@ -0,0 +1,43 @@ +From 825102a36202c4d94009a997ad4c3bf8420a4e88 Mon Sep 17 00:00:00 2001 +From: shoya0x00 +Date: Sat, 19 Oct 2024 12:42:04 +0000 +Subject: [PATCH 2/2] Settings: Set correct category and styling for google and + digital wellbeing + +On new revamped Settings UX dashboard missing styling for google and digital wellbeing tile. +This fixes the styling and move these apps tiles to their respective category + +Change-Id: I5f18fab2419c8346760c4f6bed6f77e1eac8e059 +Signed-off-by: shoya0x00 +--- + .../settings/dashboard/DashboardFragment.java | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java +index 9abc6c2..dca60f9 100644 +--- a/src/com/android/settings/dashboard/DashboardFragment.java ++++ b/src/com/android/settings/dashboard/DashboardFragment.java +@@ -556,12 +556,17 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment + screen.addPreference(pref); + } + } else { ++ Preference group = null; + if (tile.hasGroupKey() + && mDashboardTilePrefKeys.containsKey(tile.getGroupKey())) { +- Preference group = screen.findPreference(tile.getGroupKey()); +- if (group instanceof PreferenceCategory) { +- ((PreferenceCategory) group).addPreference(pref); +- } ++ group = screen.findPreference(tile.getGroupKey()); ++ } else if ("top_level_google".equals(key)) { ++ group = screen.findPreference("top_level_account_category"); ++ } else if ("top_level_wellbeing".equals(key)) { ++ group = screen.findPreference("top_level_security_privacy_category"); ++ } ++ if (group instanceof PreferenceCategory) { ++ ((PreferenceCategory) group).addPreference(pref); + } else { + screen.addPreference(pref); + } +-- +2.34.1 diff --git a/patches/personal/platform_packages_apps_Settings/0001-gsi-info-added.patch b/patches/personal/platform_packages_apps_Settings/0003-gsi-info-added.patch similarity index 100% rename from patches/personal/platform_packages_apps_Settings/0001-gsi-info-added.patch rename to patches/personal/platform_packages_apps_Settings/0003-gsi-info-added.patch