Merge "Expose invisible windows from WindowInfosListenerForTest" into udc-dev am: 31781318f0

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

Change-Id: I2e0ab9f9e8a53029ef6485ac5aabc6473354d8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hiroki Sato
2023-05-16 00:01:04 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 3 deletions

View File

@@ -4156,6 +4156,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 boolean isTrustedOverlay; field public final boolean isTrustedOverlay;
field public final boolean isVisible;
field @NonNull public final String name; field @NonNull public final String name;
field @NonNull public final android.os.IBinder windowToken; field @NonNull public final android.os.IBinder windowToken;
} }

View File

@@ -68,12 +68,18 @@ public class WindowInfosListenerForTest {
*/ */
public final boolean isTrustedOverlay; public final boolean isTrustedOverlay;
/**
* True if the window is visible.
*/
public final boolean isVisible;
WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds, WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds,
int inputConfig) { int inputConfig) {
this.windowToken = windowToken; this.windowToken = windowToken;
this.name = name; this.name = name;
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;
} }
} }
@@ -131,9 +137,6 @@ public class WindowInfosListenerForTest {
private static List<WindowInfo> buildWindowInfos(InputWindowHandle[] windowHandles) { private static List<WindowInfo> buildWindowInfos(InputWindowHandle[] windowHandles) {
var windowInfos = new ArrayList<WindowInfo>(windowHandles.length); var windowInfos = new ArrayList<WindowInfo>(windowHandles.length);
for (var handle : windowHandles) { for (var handle : windowHandles) {
if ((handle.inputConfig & InputConfig.NOT_VISIBLE) != 0) {
continue;
}
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, bounds,