| commit | 76ffbda934e763b384a779289405c7faf005c201 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Sep 13 18:18:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 13 18:18:33 2021 +0000 |
| tree | fadb701313818c4136b1b237e48948b96ede8ce3 | |
| parent | 35dc8f7c7f373efa7f57d3f7021f52f2d3b16110 [diff] | |
| parent | 14df808f4dca4417869d86c4a9964bb429b0270f [diff] |
Merge "Fix taskbar education not touchable if taskbar is stashed" into sc-v2-dev am: 14df808f4d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15794823 Change-Id: I0358afa81befc759f66126359c637c908ddbceb1
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 764b0d3..829e072 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -128,7 +128,7 @@ @Override protected boolean isTaskbarTouchable() { - return !isAnimatingToLauncher() && !mControllers.taskbarStashController.isStashed(); + return !isAnimatingToLauncher(); } private boolean isAnimatingToLauncher() {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java index b7c5db2..567a0c7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java
@@ -135,8 +135,9 @@ } else if (!mControllers.uiController.isTaskbarTouchable()) { // Let touches pass through us. insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); - } else if (mControllers.taskbarViewController.areIconsVisible()) { - // Buttons are visible, take over the full taskbar area + } else if (mControllers.taskbarViewController.areIconsVisible() + || AbstractFloatingView.getOpenView(mActivity, TYPE_ALL) != null) { + // Taskbar has some touchable elements, take over the full taskbar area insetsInfo.setTouchableInsets(mActivity.isTaskbarWindowFullscreen() ? TOUCHABLE_INSETS_FRAME : TOUCHABLE_INSETS_CONTENT); } else {