Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add displayid to WindowInfos test wrapper" into udc-dev

Browse Source
This commit is contained in:
Alex Stetson
2023-06-20 22:02:07 +00:00
committed by Android (Google) Code Review
parent ee690f9858 91654de31f
commit 037c6556c5
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -4157,6 +4157,7 @@ package android.window {
public static class WindowInfosListenerForTest.WindowInfo { public static class WindowInfosListenerForTest.WindowInfo {
field @NonNull public final android.graphics.Rect bounds; field @NonNull public final android.graphics.Rect bounds;
field public final int displayId;
field public final boolean isTrustedOverlay; field public final boolean isTrustedOverlay;
field public final boolean isVisible; field public final boolean isVisible;
field @NonNull public final String name; field @NonNull public final String name;

14
core/java/android/window/WindowInfosListenerForTest.java
View File

@@ -57,6 +57,11 @@ public class WindowInfosListenerForTest {
@NonNull @NonNull
public final String name; public final String name;
/**
* The display id the window is on.
*/
public final int displayId;
/** /**
* The window's position and size in display space. * The window's position and size in display space.
*/ */
@@ -73,10 +78,11 @@ public class WindowInfosListenerForTest {
*/ */
public final boolean isVisible; public final boolean isVisible;
WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds, WindowInfo(@NonNull IBinder windowToken, @NonNull String name, int displayId,
int inputConfig) { @NonNull Rect bounds, int inputConfig) {
this.windowToken = windowToken; this.windowToken = windowToken;
this.name = name; this.name = name;
this.displayId = displayId;
this.bounds = bounds; this.bounds = bounds;
this.isTrustedOverlay = (inputConfig & InputConfig.TRUSTED_OVERLAY) != 0; this.isTrustedOverlay = (inputConfig & InputConfig.TRUSTED_OVERLAY) != 0;
this.isVisible = (inputConfig & InputConfig.NOT_VISIBLE) == 0; this.isVisible = (inputConfig & InputConfig.NOT_VISIBLE) == 0;
@@ -139,8 +145,8 @@ public class WindowInfosListenerForTest {
for (var handle : windowHandles) { for (var handle : windowHandles) {
var bounds = new Rect(handle.frameLeft, handle.frameTop, handle.frameRight, var bounds = new Rect(handle.frameLeft, handle.frameTop, handle.frameRight,
handle.frameBottom); handle.frameBottom);
windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, bounds, windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, handle.displayId,
handle.inputConfig)); bounds, handle.inputConfig));
} }
return windowInfos; return windowInfos;
} }