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

Commit d9477aa0 authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Add displayid to WindowInfos test wrapper" into udc-dev am: 037c6556 

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



Change-Id: Ifea541bfabda19c5c5ca72c82eb2888e58d23ab6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71d8914b 037c6556

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;

    }