summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AbstractFloatingView.java
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2018-05-23 14:45:56 -0700
committerVadim Tryshev <vadimt@google.com>2018-05-23 16:51:41 -0700
commit17839d5f62dd05c19da727d072caa22f31a76ba7 (patch)
treed3d798e7bfc66aee14f2e66618ba3472a8841433 /src/com/android/launcher3/AbstractFloatingView.java
parente47fc65716173da730f35b6adac749816a0ad52e (diff)
downloadandroid_packages_apps_Trebuchet-17839d5f62dd05c19da727d072caa22f31a76ba7.tar.gz
android_packages_apps_Trebuchet-17839d5f62dd05c19da727d072caa22f31a76ba7.tar.bz2
android_packages_apps_Trebuchet-17839d5f62dd05c19da727d072caa22f31a76ba7.zip
Removing discovery bouncer from accessibility
It was obstructing views under it. Solves both Talkback and Switch Access issues. Bug: 80192025 Test: Manual Change-Id: Ia7fad91e1fcb857afbf68f879550c670279cee68
Diffstat (limited to 'src/com/android/launcher3/AbstractFloatingView.java')
-rw-r--r--src/com/android/launcher3/AbstractFloatingView.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index c75509eab..daf20323d 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -51,6 +51,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
TYPE_WIDGET_RESIZE_FRAME,
TYPE_WIDGETS_FULL_SHEET,
TYPE_ON_BOARD_POPUP,
+ TYPE_DISCOVERY_BOUNCE,
TYPE_QUICKSTEP_PREVIEW,
TYPE_TASK_MENU,
@@ -64,6 +65,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
public static final int TYPE_WIDGET_RESIZE_FRAME = 1 << 3;
public static final int TYPE_WIDGETS_FULL_SHEET = 1 << 4;
public static final int TYPE_ON_BOARD_POPUP = 1 << 5;
+ public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6;
// Popups related to quickstep UI
public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;
@@ -72,14 +74,17 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
| TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
- | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_TASK_MENU | TYPE_OPTIONS_POPUP;
+ | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU
+ | TYPE_OPTIONS_POPUP;
// Type of popups which should be kept open during launcher rebind
public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
- | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP;
+ | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE;
// Usually we show the back button when a floating view is open. Instead, hide for these types.
- public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP;
+ public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE;
+
+ public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE;
protected boolean mIsOpen;