summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-07 18:45:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-07 18:45:06 +0000
commitae43d147901d1642dcdb1f6928b02978074ff353 (patch)
treedf90863ca9666182e0ac6e8fac3fd4a9a4d9f5d8
parent76a2a6ae661813b33cce25fc0e129b8f0d03348a (diff)
parentdb1903a567bfc29bf689ff1216329d5ab6c39252 (diff)
downloadandroid_packages_apps_Trebuchet-ae43d147901d1642dcdb1f6928b02978074ff353.tar.gz
android_packages_apps_Trebuchet-ae43d147901d1642dcdb1f6928b02978074ff353.tar.bz2
android_packages_apps_Trebuchet-ae43d147901d1642dcdb1f6928b02978074ff353.zip
Merge "Removing extra accessibility box from Recents" into ub-launcher3-edmonton
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java3
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/OverviewState.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java
index 496fa96b3..89dd87993 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java
@@ -25,7 +25,8 @@ import com.android.quickstep.views.RecentsView;
public class FastOverviewState extends OverviewState {
private static final int STATE_FLAGS = FLAG_SHOW_SCRIM | FLAG_DISABLE_RESTORE
- | FLAG_DISABLE_INTERACTION | FLAG_OVERVIEW_UI | FLAG_HIDE_BACK_BUTTON;
+ | FLAG_DISABLE_INTERACTION | FLAG_OVERVIEW_UI | FLAG_HIDE_BACK_BUTTON
+ | FLAG_DISABLE_ACCESSIBILITY;
public FastOverviewState(int id) {
super(id, QuickScrubController.QUICK_SCRUB_START_DURATION, STATE_FLAGS);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java
index f87f00657..5bdf1b5e9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java
@@ -35,7 +35,7 @@ import com.android.quickstep.views.RecentsView;
public class OverviewState extends LauncherState {
private static final int STATE_FLAGS = FLAG_SHOW_SCRIM | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED
- | FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI;
+ | FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_DISABLE_ACCESSIBILITY;
public OverviewState(int id) {
this(id, OVERVIEW_TRANSITION_MS, STATE_FLAGS);