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

Commit 91654de3 authored by Alex Stetson's avatar Alex Stetson
Browse files

Add displayid to WindowInfos test wrapper 

Display id parameter is required to know if two windows are located on
the same display when testing.

Bug: 286188365
Test: atest CtsWidgetTestCases
Change-Id: I25ed06a1da8649c3175ae7bb4f1ad87ebb33e282
parent caefef31

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4157,6 +4157,7 @@ package android.window { 


  public static class WindowInfosListenerForTest.WindowInfo {

    field @NonNull public final android.graphics.Rect bounds;

    field public final int displayId;

    field public final boolean isTrustedOverlay;

    field public final boolean isVisible;

    field @NonNull public final String name;

core/java/android/window/WindowInfosListenerForTest.java

+10 −4
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ public class WindowInfosListenerForTest { 
        @NonNull

        public final String name;



        /**

         * The display id the window is on.

         */

        public final int displayId;



        /**

         * The window's position and size in display space.

         */
@@ -73,10 +78,11 @@ public class WindowInfosListenerForTest { 
         */

        public final boolean isVisible;



        WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds,

                int inputConfig) {

        WindowInfo(@NonNull IBinder windowToken, @NonNull String name, int displayId,

                @NonNull Rect bounds, int inputConfig) {

            this.windowToken = windowToken;

            this.name = name;

            this.displayId = displayId;

            this.bounds = bounds;

            this.isTrustedOverlay = (inputConfig & InputConfig.TRUSTED_OVERLAY) != 0;

            this.isVisible = (inputConfig & InputConfig.NOT_VISIBLE) == 0;
@@ -139,8 +145,8 @@ public class WindowInfosListenerForTest { 
        for (var handle : windowHandles) {

            var bounds = new Rect(handle.frameLeft, handle.frameTop, handle.frameRight,

                    handle.frameBottom);

            windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, bounds,

                    handle.inputConfig));

            windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, handle.displayId,

                    bounds, handle.inputConfig));

        }

        return windowInfos;

    }