Merge "Set taskbar touchable region to empty when all apps is open." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5ad574ae60
@@ -16,6 +16,7 @@
|
||||
package com.android.launcher3.taskbar;
|
||||
|
||||
import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
|
||||
import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS;
|
||||
import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_CONTENT;
|
||||
import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
|
||||
import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
|
||||
@@ -184,6 +185,9 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa
|
||||
} else if (mControllers.taskbarDragController.isSystemDragInProgress()) {
|
||||
// Let touches pass through us.
|
||||
insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
|
||||
} else if (AbstractFloatingView.getOpenView(mActivity, TYPE_TASKBAR_ALL_APPS) != null) {
|
||||
// Let touches pass through us.
|
||||
insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
|
||||
} else if (mControllers.taskbarViewController.areIconsVisible()
|
||||
|| AbstractFloatingView.getOpenView(mActivity, TYPE_ALL) != null
|
||||
|| mActivity.isNavBarKidsModeActive()) {
|
||||
|
||||
Reference in New Issue
Block a user