summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/res/res/color-night/surface_effect_2_color.xml20
-rw-r--r--core/res/res/color-night/surface_effect_3_color.xml20
-rw-r--r--core/res/res/color/surface_effect_2_color.xml20
-rw-r--r--core/res/res/color/surface_effect_3_color.xml20
-rw-r--r--core/res/res/values-night/colors.xml2
-rw-r--r--core/res/res/values/colors.xml2
-rw-r--r--core/res/res/values/symbols.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/common/shared/colors/SurfaceEffectColors.kt17
8 files changed, 98 insertions, 5 deletions
diff --git a/core/res/res/color-night/surface_effect_2_color.xml b/core/res/res/color-night/surface_effect_2_color.xml
new file mode 100644
index 000000000000..6485017bec98
--- /dev/null
+++ b/core/res/res/color-night/surface_effect_2_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2025 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@android:color/system_accent1_100"
+ android:alpha="0.15"/>
+</selector>
diff --git a/core/res/res/color-night/surface_effect_3_color.xml b/core/res/res/color-night/surface_effect_3_color.xml
new file mode 100644
index 000000000000..a7a7f8d89549
--- /dev/null
+++ b/core/res/res/color-night/surface_effect_3_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2025 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@android:color/system_accent1_100"
+ android:alpha="0.10"/>
+</selector>
diff --git a/core/res/res/color/surface_effect_2_color.xml b/core/res/res/color/surface_effect_2_color.xml
new file mode 100644
index 000000000000..91c84095ec12
--- /dev/null
+++ b/core/res/res/color/surface_effect_2_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2025 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@android:color/system_accent1_0"
+ android:alpha="0.32"/>
+</selector>
diff --git a/core/res/res/color/surface_effect_3_color.xml b/core/res/res/color/surface_effect_3_color.xml
new file mode 100644
index 000000000000..d766a32aff8b
--- /dev/null
+++ b/core/res/res/color/surface_effect_3_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2025 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@android:color/system_accent1_600"
+ android:alpha="0.15"/>
+</selector>
diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml
index 7b9b2d666292..e19ee23a8bd2 100644
--- a/core/res/res/values-night/colors.xml
+++ b/core/res/res/values-night/colors.xml
@@ -50,6 +50,8 @@
<!-- Color for various surfaces related to system-wide blur -->
<color name="surface_effect_0">@color/surface_effect_0_color</color>
<color name="surface_effect_1">@color/surface_effect_1_color</color>
+ <color name="surface_effect_2">@color/surface_effect_2_color</color>
+ <color name="surface_effect_3">@color/surface_effect_3_color</color>
<!-- Color for side fps toast dark theme-->
<color name="side_fps_toast_background">#2E3132</color>
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 864daf9d2072..4e93c44e44bd 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -585,6 +585,8 @@
<!-- Color for various surfaces related to system-wide blur -->
<color name="surface_effect_0">@color/surface_effect_0_color</color>
<color name="surface_effect_1">@color/surface_effect_1_color</color>
+ <color name="surface_effect_2">@color/surface_effect_2_color</color>
+ <color name="surface_effect_3">@color/surface_effect_3_color</color>
<!-- Color for system bars -->
<color name="navigation_bar_compatible">@android:color/black</color>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index b013ffd41ecb..f1560bc1f47b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -535,6 +535,8 @@
<java-symbol type="color" name="surface_effect_0" />
<java-symbol type="color" name="surface_effect_1" />
+ <java-symbol type="color" name="surface_effect_2" />
+ <java-symbol type="color" name="surface_effect_3" />
<java-symbol type="color" name="tab_indicator_text_v4" />
<java-symbol type="dimen" name="accessibility_touch_slop" />
diff --git a/packages/SystemUI/src/com/android/systemui/common/shared/colors/SurfaceEffectColors.kt b/packages/SystemUI/src/com/android/systemui/common/shared/colors/SurfaceEffectColors.kt
index 7c2fc7fe3aee..5e8c21f9abf5 100644
--- a/packages/SystemUI/src/com/android/systemui/common/shared/colors/SurfaceEffectColors.kt
+++ b/packages/SystemUI/src/com/android/systemui/common/shared/colors/SurfaceEffectColors.kt
@@ -20,12 +20,19 @@ import android.content.res.Resources
object SurfaceEffectColors {
@JvmStatic
- fun Resources.surfaceEffect0(): Int {
- return getColor(com.android.internal.R.color.surface_effect_0)
+ fun surfaceEffect0(r: Resources): Int {
+ return r.getColor(com.android.internal.R.color.surface_effect_0)
+ }
+ @JvmStatic
+ fun surfaceEffect1(r: Resources): Int {
+ return r.getColor(com.android.internal.R.color.surface_effect_1)
+ }
+ @JvmStatic
+ fun surfaceEffect2(r: Resources): Int {
+ return r.getColor(com.android.internal.R.color.surface_effect_2)
}
-
@JvmStatic
- fun Resources.surfaceEffect1(): Int {
- return getColor(com.android.internal.R.color.surface_effect_1)
+ fun surfaceEffect3(r: Resources): Int {
+ return r.getColor(com.android.internal.R.color.surface_effect_3)
}
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-31 02:50:59 +0000