Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d41969c7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Change background color of fold/unfold" into tm-qpr-dev am:... 

Merge "Merge "Change background color of fold/unfold" into tm-qpr-dev am: 6230df58 am: c143228d" into udc-dev am: 61de1e2e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22138584



Change-Id: I6b37e4f0ce7f6adacc2ed16c3a040abe8fb4a88c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3582c07 61de1e2e

libs/WindowManager/Shell/res/color/unfold_background.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?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

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java

+1 −1
Original line number Diff line number Diff line
@@ -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,