summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-20 17:43:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-20 17:43:19 +0000
commit61de1e2ee001f742fbc647e4cd1ad7d147d665d9 (patch)
treea912b79eeb34ce528b7c544a7c61c74c6aa90a51
parent24b93414978b1b00581f06678281eec4f1049ed6 (diff)
parent6368b1990c8007ab1b38b8616560d2774e96cfcc (diff)
Merge "Merge "Change background color of fold/unfold" into tm-qpr-dev am: 6230df586f am: c143228daf" into udc-dev
-rw-r--r--libs/WindowManager/Shell/res/color/unfold_background.xml4
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/res/color/unfold_background.xml b/libs/WindowManager/Shell/res/color/unfold_background.xml
new file mode 100644
index 000000000000..e33eb126012d
--- /dev/null
+++ b/libs/WindowManager/Shell/res/color/unfold_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@android:color/system_neutral1_500" android:lStar="5" />
+</selector> \ No newline at end of file
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java
index 86ca292399cb..fe0a3fb7b9dc 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java
@@ -79,7 +79,7 @@ public class UnfoldBackgroundController {
}
private float[] getBackgroundColor(Context context) {
- int colorInt = context.getResources().getColor(R.color.taskbar_background);
+ int colorInt = context.getResources().getColor(R.color.unfold_background);
return new float[]{
(float) red(colorInt) / 255.0F,
(float) green(colorInt) / 255.0F,