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

Commit f3151b8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show task background surface" into tm-qpr-dev am: 7e8d76ad 

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



Change-Id: Iff84ca3041e390fd253346932b7409da5eb0caaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7892114f 7e8d76ad

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+3 −1
Original line number Diff line number Diff line
@@ -233,7 +233,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> 
        mTmpColor[2] = (float) Color.blue(backgroundColorInt) / 255.f;

        startT.setWindowCrop(mTaskBackgroundSurface, taskBounds.width(), taskBounds.height())

                .setShadowRadius(mTaskBackgroundSurface, shadowRadius)

                .setColor(mTaskBackgroundSurface, mTmpColor);

                .setColor(mTaskBackgroundSurface, mTmpColor)

                .setLayer(mTaskBackgroundSurface, -1)

                .show(mTaskBackgroundSurface);



        // Caption view

        mCaptionWindowManager.setConfiguration(taskConfig);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ public class WindowDecorationTests extends ShellTestCase { 
        verify(mMockSurfaceControlStartT)

                .setColor(taskBackgroundSurface, new float[] {1.f, 1.f, 0.f});

        verify(mMockSurfaceControlStartT).setShadowRadius(taskBackgroundSurface, 10);

        verify(mMockSurfaceControlStartT).setLayer(taskBackgroundSurface, -1);

        verify(mMockSurfaceControlStartT).show(taskBackgroundSurface);



        verify(mMockSurfaceControlViewHostFactory)

                .create(any(), eq(defaultDisplay), any(), anyBoolean());