diff options
| author | 2023-03-20 17:42:15 +0000 | |
|---|---|---|
| committer | 2023-03-20 17:42:15 +0000 | |
| commit | 6368b1990c8007ab1b38b8616560d2774e96cfcc (patch) | |
| tree | 9c086eef935b64d8ea8a195ec2c40ecf1d6c2cca | |
| parent | c2a7c333730dc7ebf3b7c2eb22c502185c634139 (diff) | |
| parent | c143228daf26b1a106fad2b70037ca655945ab3f (diff) | |
Merge "Change background color of fold/unfold" into tm-qpr-dev am: 6230df586f am: c143228daf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22138584
Change-Id: Ie2bee6f0c2acaa46375305cf9f1424c304486c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/res/color/unfold_background.xml | 4 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java | 2 |
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, |