Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912e6dd6 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Allow touches on transient taskbar if ime is present." into tm-qpr-dev

parents a7fafd69 106cc895

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ class TaskbarInsetsController(val context: TaskbarActivityContext): LoggableTask 
        if (context.dragLayer.alpha < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {

            // Let touches pass through us.

            insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION)

        } else if (controllers.navbarButtonsViewController.isImeVisible) {

        } else if (controllers.navbarButtonsViewController.isImeVisible

                && controllers.taskbarStashController.isStashed()) {

            insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION)

        } else if (!controllers.uiController.isTaskbarTouchable) {

            // Let touches pass through us.

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
     * Should be called when the IME visibility changes, so we can make Taskbar not steal touches.

     */

    public void setImeIsVisible(boolean isImeVisible) {

        mTaskbarView.setTouchesEnabled(!isImeVisible);

        mTaskbarView.setTouchesEnabled(!isImeVisible

                || DisplayController.isTransientTaskbar(mActivity));

    }



    /**