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>
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user