diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index 9c14b8510e..7431551710 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -41,7 +41,7 @@ - + { + if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) { + // We're invisible, let touches pass through us. + insetsInfo.touchableRegion.setEmpty(); + insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); + } else { + // We're visible again, accept touches anywhere in our bounds. + insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME); + } + }; + } + + protected void cleanup() { + ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + + ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(), + mTaskbarInsetsComputer); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + + cleanup(); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java index 6a74aac2ba..260428dbc2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java @@ -38,7 +38,6 @@ import com.android.launcher3.BaseQuickstepLauncher; import com.android.launcher3.LauncherState; import com.android.launcher3.QuickstepAppTransitionManagerImpl; import com.android.launcher3.R; -import com.android.launcher3.anim.AlphaUpdateListener; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.states.StateAnimationConfig; @@ -107,7 +106,6 @@ public class TaskbarController { @Override public void updateTaskbarVisibilityAlpha(float alpha) { mTaskbarContainerView.setAlpha(alpha); - AlphaUpdateListener.updateVisibility(mTaskbarContainerView); } }; } @@ -167,6 +165,7 @@ public class TaskbarController { public void init() { mTaskbarView.init(mHotseatController.getNumHotseatIcons(), mRecentsController.getNumRecentIcons()); + mTaskbarContainerView.init(mTaskbarView); addToWindowManager(); mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks()); mTaskbarVisibilityController.init(); @@ -188,6 +187,7 @@ public class TaskbarController { */ public void cleanup() { mTaskbarView.cleanup(); + mTaskbarContainerView.cleanup(); removeFromWindowManager(); mTaskbarStateHandler.setTaskbarCallbacks(null); mTaskbarVisibilityController.cleanup(); @@ -218,6 +218,7 @@ public class TaskbarController { mWindowLayoutParams.setFitInsetsTypes(0); mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; + mWindowLayoutParams.setSystemApplicationOverlay(true); WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance(); wmWrapper.setProvidesInsetsTypes(