diff options
| author | Alex Chau <alexchau@google.com> | 2021-11-03 14:19:23 +0000 |
|---|---|---|
| committer | Alex Chau <alexchau@google.com> | 2021-11-03 14:19:23 +0000 |
| commit | c91a43e110b96ad0e675f95e4d89cdae32262a74 (patch) | |
| tree | c15d02f5aa953c53d6020129cad93fc260571e0c /quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java | |
| parent | 571df892f700019652d9acf272abad2c63886dd6 (diff) | |
Revert "DO NOT MERGE Fix the cutout of magnification border"
Revert "Do NOT MERGE Fix magnification border includes taskbar"
Revert submission 16003793-magnification_border
Bug: 196510717
Reason for revert: Caused NexusLauncherTests and NexusLauncherOutOfProcTests to stop running
Reverted Changes:
Ibbc9c51ea:Do NOT MERGE Fix magnification border includes tas...
Ida2bb5bf1:DO NOT MERGE Fix the cutout of magnification borde...
Change-Id: I6b2123aedd2a2f23142a34f158d2d9ab71948a18
Diffstat (limited to 'quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java index 8c6185cb0f..cec892f7a7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java @@ -137,14 +137,12 @@ public class TaskbarDragLayerController { // Always have nav buttons be touchable mControllers.navbarButtonsViewController.addVisibleButtonsRegion( mTaskbarDragLayer, insetsInfo.touchableRegion); - boolean insetsIsTouchableRegion = true; if (mTaskbarDragLayer.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) { // Let touches pass through us. insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } else if (mControllers.navbarButtonsViewController.isImeVisible()) { insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_CONTENT); - insetsIsTouchableRegion = false; } else if (!mControllers.uiController.isTaskbarTouchable()) { // Let touches pass through us. insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); @@ -153,11 +151,9 @@ public class TaskbarDragLayerController { // Taskbar has some touchable elements, take over the full taskbar area insetsInfo.setTouchableInsets(mActivity.isTaskbarWindowFullscreen() ? TOUCHABLE_INSETS_FRAME : TOUCHABLE_INSETS_CONTENT); - insetsIsTouchableRegion = false; } else { insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } - mActivity.excludeFromMagnificationRegion(insetsIsTouchableRegion); } /** |