diff options
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/window/WindowInfosListenerForTest.java | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 9bd29700a12d..0c9569f730cd 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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; diff --git a/core/java/android/window/WindowInfosListenerForTest.java b/core/java/android/window/WindowInfosListenerForTest.java index cfbeeffb91a6..25bf85cfaa58 100644 --- a/core/java/android/window/WindowInfosListenerForTest.java +++ b/core/java/android/window/WindowInfosListenerForTest.java @@ -58,6 +58,11 @@ public class WindowInfosListenerForTest { public final String name; /** + * The display id the window is on. + */ + public final int displayId; + + /** * The window's position and size in display space. */ @NonNull @@ -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; } |