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

Commit ddb90960 authored by Jon Miranda's avatar Jon Miranda
Browse files

Remove setImeIsVisible/setTouchesEnabled as its already handled by insets. 

Bug: 260101467
Test: manual
Change-Id: Iba22a6db61abd4be0b2a15b2e4099d9bc03ddbc9
parent 7729aa4c

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

+0 −2
Original line number Diff line number Diff line
@@ -560,8 +560,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {

        mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags,

                fromInit);

        mControllers.taskbarViewController.setImeIsVisible(

                mControllers.navbarButtonsViewController.isImeVisible());

        int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED

                | SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

        onNotificationShadeExpandChanged((systemUiStateFlags & shadeExpandedFlags) != 0, fromInit);

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

+0 −19
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
    private View.OnClickListener mIconClickListener;

    private View.OnLongClickListener mIconLongClickListener;



    // Prevents dispatching touches to children if true

    private boolean mTouchEnabled = true;



    // Only non-null when the corresponding Folder is open.

    private @Nullable FolderIcon mLeaveBehindFolderIcon;
@@ -381,14 +378,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        }

    }



    @Override

    public boolean dispatchTouchEvent(MotionEvent ev) {

        if (!mTouchEnabled) {

            return true;

        }

        return super.dispatchTouchEvent(ev);

    }



    @Override

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        mControllerCallbacks.onInterceptTouchEvent(ev);
@@ -397,9 +386,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 


    @Override

    public boolean onTouchEvent(MotionEvent event) {

        if (!mTouchEnabled) {

            return true;

        }

        if (mIconLayoutBounds.left <= event.getX()

                && event.getX() <= mIconLayoutBounds.right

                && !DisplayController.isTransientTaskbar(mActivityContext)) {
@@ -420,11 +406,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        return super.onTouchEvent(event);

    }



    public void setTouchesEnabled(boolean touchEnabled) {

        this.mTouchEnabled = touchEnabled;

        mControllerCallbacks.clearTouchInProgress();

    }



    /**

     * Returns whether the given MotionEvent, *in screen coorindates*, is within any Taskbar item's

     * touch bounds.

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

+0 −8
Original line number Diff line number Diff line
@@ -198,14 +198,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
        return mTaskbarIconAlpha;

    }



    /**

     * Should be called when the IME visibility changes, so we can make Taskbar not steal touches.

     */

    public void setImeIsVisible(boolean isImeVisible) {

        mTaskbarView.setTouchesEnabled(!isImeVisible

                || DisplayController.isTransientTaskbar(mActivity));

    }



    /**

     * Should be called when the recents button is disabled, so we can hide taskbar icons as well.

     */