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

Commit c8a5176b authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Handle SystemGestureRegion in TaskbarDragLayer 

- Currently user can tap on taskbar icons when in persitent mode when a popup is visible on screen.
we are making it so that touch event is not performed at view level and get dismissed before at drag layer.

Test: Presubmit, Manual
Bug: 320229858
Flag: NONE
Change-Id: I9a76faa0e282317d808ba0f55b49741dc7b750a3
parent 4638d4c8

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

+9 −0
Original line number Diff line number Diff line
@@ -146,6 +146,15 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> { 
        onDestroy(true);

    }



    @Override

    protected boolean isEventWithinSystemGestureRegion(MotionEvent ev) {

        final float x = ev.getX();

        final float y = ev.getY();



        return x >= mSystemGestureRegion.left && x < getWidth() - mSystemGestureRegion.right

                && y >= mSystemGestureRegion.top;

    }



    @Override

    protected boolean canFindActiveController() {

        // Unlike super class, we want to be able to find controllers when touches occur in the

src/com/android/launcher3/views/BaseDragLayer.java

+5 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> 
    protected final Rect mHitRect = new Rect();



    @ViewDebug.ExportedProperty(category = "launcher")

    private final RectF mSystemGestureRegion = new RectF();

    protected final RectF mSystemGestureRegion = new RectF();

    private int mTouchDispatchState = 0;



    protected final T mActivity;
@@ -164,7 +164,7 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> 
        return findActiveController(ev);

    }



    private boolean isEventInLauncher(MotionEvent ev) {

    protected boolean isEventWithinSystemGestureRegion(MotionEvent ev) {

        final float x = ev.getX();

        final float y = ev.getY();
@@ -175,7 +175,8 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> 
    private TouchController findControllerToHandleTouch(MotionEvent ev) {

        AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity);

        if (topView != null

                && (isEventInLauncher(ev) || topView.canInterceptEventsInSystemGestureRegion())

                && (isEventWithinSystemGestureRegion(ev)

                || topView.canInterceptEventsInSystemGestureRegion())

                && topView.onControllerInterceptTouchEvent(ev)) {

            return topView;

        }
@@ -287,7 +288,7 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> 
                mTouchDispatchState |= TOUCH_DISPATCHING_FROM_VIEW

                        | TOUCH_DISPATCHING_TO_VIEW_IN_PROGRESS;



                if (isEventInLauncher(ev)) {

                if (isEventWithinSystemGestureRegion(ev)) {

                    mTouchDispatchState &= ~TOUCH_DISPATCHING_FROM_VIEW_GESTURE_REGION;

                } else {

                    mTouchDispatchState |= TOUCH_DISPATCHING_FROM_VIEW_GESTURE_REGION;