summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-17 02:12:06 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-17 02:12:06 -0700
commit94ca67cfbca3d78900234b93b4997bfb49c4c3af (patch)
treeccbb6f832d4e13a51d2988ab016cf417a2847f9c
parentb96eb497da0bd1412600bf625805b3b14cd3693d (diff)
parent3b32efc31652508d2d9b8c93e0037a69b68e4525 (diff)
Merge "Remove hardcoded color for dynamic items" into main
-rw-r--r--res/values/colors.xml2
-rw-r--r--src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java4
2 files changed, 0 insertions, 6 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9c9a29c79f9..af7b1320b05 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -84,8 +84,6 @@
<color name="homepage_location_background">@color/homepage_cyan_bg</color>
<color name="homepage_accounts_foreground">@color/homepage_cyan_fg</color>
<color name="homepage_accounts_background">@color/homepage_cyan_bg</color>
- <color name="homepage_wellbeing_foreground">@color/homepage_cyan_fg</color>
- <color name="homepage_wellbeing_background">@color/homepage_cyan_bg</color>
<color name="homepage_supervision_foreground">@color/homepage_cyan_fg</color>
<color name="homepage_supervision_background">@color/homepage_cyan_bg</color>
<color name="homepage_safety_foreground">@color/homepage_red_fg</color>
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index f61fbb6d13a..4fd8a211c35 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -507,10 +507,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
R.dimen.dashboard_tile_image_size);
drawable.setLayerSize(0, size, size);
return drawable;
- } else if (TextUtils.equals(tile.getPackageName(),
- mPackageManager.getWellbeingPackageName())) {
- return getRoundedIcon(iconDrawable,
- R.color.homepage_wellbeing_foreground, R.color.homepage_wellbeing_background);
}
Pair<Integer, Integer> colors = getSchemedColors(tile);