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

Commit e65e315d authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Use mDecorWindowContext to verify window resources" into udc-qpr-dev... 

Merge "Use mDecorWindowContext to verify window resources" into udc-qpr-dev am: ae684a40 am: 78f8fb01

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



Change-Id: I8f56c1be7a663a413512b2de8078a00cced2aae6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40c43b07 78f8fb01

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

+7 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.window.SurfaceSyncGroup; 
import android.window.WindowContainerTransaction;



import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;
@@ -411,15 +410,17 @@ public class WindowDecorationTests extends ShellTestCase { 
        verify(additionalWindowSurfaceBuilder).build();

        verify(mMockSurfaceControlAddWindowT).setPosition(additionalWindowSurface, 0, 0);

        final int width = WindowDecoration.loadDimensionPixelSize(

                mContext.getResources(), mCaptionMenuWidthId);

                windowDecor.mDecorWindowContext.getResources(), mCaptionMenuWidthId);

        final int height = WindowDecoration.loadDimensionPixelSize(

                mContext.getResources(), mRelayoutParams.mCaptionHeightId);

                windowDecor.mDecorWindowContext.getResources(), mRelayoutParams.mCaptionHeightId);

        verify(mMockSurfaceControlAddWindowT).setWindowCrop(additionalWindowSurface, width, height);

        final int shadowRadius = WindowDecoration.loadDimensionPixelSize(mContext.getResources(),

        final int shadowRadius = WindowDecoration.loadDimensionPixelSize(

                windowDecor.mDecorWindowContext.getResources(),

                mCaptionMenuShadowRadiusId);

        verify(mMockSurfaceControlAddWindowT)

                .setShadowRadius(additionalWindowSurface, shadowRadius);

        final int cornerRadius = WindowDecoration.loadDimensionPixelSize(mContext.getResources(),

        final int cornerRadius = WindowDecoration.loadDimensionPixelSize(

                windowDecor.mDecorWindowContext.getResources(),

                mCaptionMenuCornerRadiusId);

        verify(mMockSurfaceControlAddWindowT)

                .setCornerRadius(additionalWindowSurface, cornerRadius);
@@ -514,8 +515,7 @@ public class WindowDecorationTests extends ShellTestCase { 


    private TestWindowDecoration createWindowDecoration(

            ActivityManager.RunningTaskInfo taskInfo, SurfaceControl testSurface) {

        return new TestWindowDecoration(InstrumentationRegistry.getInstrumentation().getContext(),

                mMockDisplayController, mMockShellTaskOrganizer,

        return new TestWindowDecoration(mContext, mMockDisplayController, mMockShellTaskOrganizer,

                taskInfo, testSurface,

                new MockObjectSupplier<>(mMockSurfaceControlBuilders,

                        () -> createMockSurfaceControlBuilder(mock(SurfaceControl.class))),