Snap for 12019843 from 4a696ae8d7a111f9702c6c0fed6b6cec2d864daa to 24Q4-release (9647e695) · Commits · e / os / android_frameworks_libs_systemui

monet/TEST_MAPPING

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsGraphicsTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}
		No newline at end of file

monet/src/com/android/systemui/monet/CustomDynamicColors.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "clock_hour",
		/* palette= */ (s) -> s.secondaryPalette,
		/* tone= */ (s) -> s.isDark ? 30.0 : 60.0,
		/* tone= */ (s) -> s.isDark ? 60.0 : 30.0,
		/* isBackground= */ false,
		/* background= */ (s) -> widgetBackground(),
		/* secondBackground= */ null,
		@@ -61,7 +61,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "clock_minute",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 40.0 : 90.0,
		/* tone= */ (s) -> s.isDark ? 90.0 : 40.0,
		/* isBackground= */ false,
		/* background= */ (s) -> widgetBackground(),
		/* secondBackground= */ null,
		@@ -73,7 +73,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "clock_second",
		/* palette= */ (s) -> s.tertiaryPalette,
		/* tone= */ (s) -> s.isDark ? 40.0 : 90.0,
		/* tone= */ (s) -> s.isDark ? 90.0 : 40.0,
		/* isBackground= */ false,
		/* background= */ (s) -> widgetBackground(),
		/* secondBackground= */ null,
		@@ -83,9 +83,9 @@ class CustomDynamicColors {

		public DynamicColor weatherTemp() {
		return new DynamicColor(
		/* name= */ "clock_second",
		/* name= */ "weather_temp",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 55.0 : 80.0,
		/* tone= */ (s) -> s.isDark ? 80.0 : 55.0,
		/* isBackground= */ false,
		/* background= */ (s) -> widgetBackground(),
		/* secondBackground= */ null,
		@@ -99,7 +99,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "theme_app",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 90.0 : 30.0, // Adjusted values
		/* tone= */ (s) -> s.isDark ? 30.0 : 90.0, // Adjusted values
		/* isBackground= */ true,
		/* background= */ null,
		/* secondBackground= */ null,
		@@ -111,7 +111,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "on_theme_app",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 40.0 : 80.0, // Adjusted values
		/* tone= */ (s) -> s.isDark ? 80.0 : 40.0, // Adjusted values
		/* isBackground= */ false,
		/* background= */ (s) -> themeApp(),
		/* secondBackground= */ null,
		@@ -135,7 +135,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "theme_notif",
		/* palette= */ (s) -> s.tertiaryPalette,
		/* tone= */ (s) -> s.isDark ? 80.0 : 90.0,
		/* tone= */ (s) -> s.isDark ? 90.0 : 80.0,
		/* isBackground= */ false,
		/* background= */ (s) -> themeAppRing(),
		/* secondBackground= */ null,
		@@ -151,7 +151,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "brand_a",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 40.0 : 80.0,
		/* tone= */ (s) -> s.isDark ? 80.0 : 40.0,
		/* isBackground= */ true,
		/* background= */ (s) -> mMdc.surfaceContainerLow(),
		/* secondBackground= */ null,
		@@ -164,7 +164,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "brand_b",
		/* palette= */ (s) -> s.secondaryPalette,
		/* tone= */ (s) -> s.isDark ? 70.0 : 98.0,
		/* tone= */ (s) -> s.isDark ? 98.0 : 70.0,
		/* isBackground= */ true,
		/* background= */ (s) -> mMdc.surfaceContainerLow(),
		/* secondBackground= */ null,
		@@ -177,7 +177,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "brand_c",
		/* palette= */ (s) -> s.primaryPalette,
		/* tone= */ (s) -> s.isDark ? 50.0 : 60.0,
		/* tone= */ (s) -> s.isDark ? 60.0 : 50.0,
		/* isBackground= */ false,
		/* background= */ (s) -> mMdc.surfaceContainerLow(),
		/* secondBackground= */ null,
		@@ -190,7 +190,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "brand_d",
		/* palette= */ (s) -> s.tertiaryPalette,
		/* tone= */ (s) -> s.isDark ? 59.0 : 90.0,
		/* tone= */ (s) -> s.isDark ? 90.0 : 59.0,
		/* isBackground= */ false,
		/* background= */ (s) -> mMdc.surfaceContainerLow(),
		/* secondBackground= */ null,
		@@ -312,7 +312,7 @@ class CustomDynamicColors {
		return new DynamicColor(
		/* name= */ "overview_background",
		/* palette= */ (s) -> s.neutralVariantPalette,
		/* tone= */ (s) -> s.isDark ? 80.0 : 35.0,
		/* tone= */ (s) -> s.isDark ? 35.0 : 80.0,
		/* isBackground= */ true,
		/* background= */ null,
		/* secondBackground= */ null,

monet/src/com/android/systemui/monet/DynamicColors.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class DynamicColors {
		list.add(Pair.create("theme_app", customMdc.themeApp()));
		list.add(Pair.create("on_theme_app", customMdc.onThemeApp()));
		list.add(Pair.create("theme_app_ring", customMdc.themeAppRing()));
		list.add(Pair.create("on_theme_app_ring", customMdc.themeNotif()));
		list.add(Pair.create("theme_notif", customMdc.themeNotif()));
		list.add(Pair.create("brand_a", customMdc.brandA()));
		list.add(Pair.create("brand_b", customMdc.brandB()));
		list.add(Pair.create("brand_c", customMdc.brandC()));