summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Isganitis <brianji@google.com> 2025-02-25 19:03:08 -0500
committer Brian Isganitis <brianji@google.com> 2025-02-27 19:41:48 -0500
commit8bab8eb1716f518f7ca1f523c256a6c937e8cd48 (patch)
treed0a6731678279679a7ca7ac75ff0f93e4f6e51be
parentc3838666309ffa7467acad2a9bf3e46bccb9f6f4 (diff)
Remove TYPE_TASKBAR_OVERLAY_PROXY from TYPE_ACCESSIBLE.
The invisible proxy view was preventing anything below it from being accessible. Flag: EXEMPT bugfix Fix: 377526512 Test: #14 in bug. Change-Id: I9d4596ebbbc4317a9ff7ded37b43b5fa1885e6ea
-rw-r--r--src/com/android/launcher3/AbstractFloatingView.java3
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 753b2e2978..b90200b88c 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -126,7 +126,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
/** Type of popups that should get exclusive accessibility focus. */
public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER
& ~TYPE_ALL_APPS_EDU & ~TYPE_TASKBAR_ALL_APPS & ~TYPE_PIN_IME_POPUP
- & ~TYPE_WIDGET_RESIZE_FRAME & ~TYPE_ONE_GRID_MIGRATION_EDU & ~TYPE_ON_BOARD_POPUP;
+ & ~TYPE_WIDGET_RESIZE_FRAME & ~TYPE_ONE_GRID_MIGRATION_EDU & ~TYPE_ON_BOARD_POPUP
+ & ~TYPE_TASKBAR_OVERLAY_PROXY;
// These view all have particular operation associated with swipe down interaction.
public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET |
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 16faf14d86..de31c4dd9a 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -947,7 +947,9 @@ public final class LauncherInstrumentation {
waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
waitUntilLauncherObjectGone(WIDGETS_RES_ID);
waitUntilSystemLauncherObjectGone(OVERVIEW_RES_ID);
- waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);
+ if (isTransientTaskbar()) {
+ waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);
+ }
waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);
waitUntilLauncherObjectGone(KEYBOARD_QUICK_SWITCH_RES_ID);