diff options
| author | 2022-08-09 03:36:54 +0000 | |
|---|---|---|
| committer | 2022-08-09 03:36:54 +0000 | |
| commit | f3151b8cde7a2735a0411e7003458b1a89c8caf8 (patch) | |
| tree | e419f161f46db7a3b3bc23e411a604040af2236f | |
| parent | 7892114fd6b8f577488b19ee3a735ea9762364ff (diff) | |
| parent | 7e8d76adf0b95ef9eebe53a51030de6dd8578cf3 (diff) | |
Merge "Show task background surface" into tm-qpr-dev am: 7e8d76adf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19542257
Change-Id: Iff84ca3041e390fd253346932b7409da5eb0caaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index 087304b0d00b..506a4c0f90f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -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); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 1e7d5fe95229..226843eca64e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -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()); |