PawletOS/Lawnchair
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 am: 14df808f4d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15794823

Change-Id: I0358afa81befc759f66126359c637c908ddbceb1
This commit is contained in:
TreeHugger Robot
2021-09-13 18:18:33 +00:00
committed by Automerger Merge Worker
parent 35dc8f7c7f 14df808f4d
commit 76ffbda934
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 {