msemes/Flexera-Launcher
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix taskbar education not touchable if taskbar is stashed" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2021-09-13 18:05:28 +00:00
2 parents 33df165ca0 cc6a1d6584
commit 14df808f4d
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
@Override
protected boolean isTaskbarTouchable() {
return !isAnimatingToLauncher() && !mControllers.taskbarStashController.isStashed();
return !isAnimatingToLauncher();
}
private boolean isAnimatingToLauncher() {
quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java
+3 -2
View File
@@ -135,8 +135,9 @@ public class TaskbarDragLayerController {
} 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 {