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

Commit 3c311682 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Pass through touches in FolderIcon padding area 

Pass touch events happening in padding of folder icon to workspace. BubbleTextView already does this.

Bug: 161014416
Test: Manual
Change-Id: Ibfa24adb2d84efbfab36f02a2240837f03858e43
parent a8c08584

src/com/android/launcher3/folder/FolderIcon.java

+16 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 
    private float mDotScale;

    private Animator mDotScaleAnim;



    private Rect mTouchArea = new Rect();



    private final PointF mTranslationForReorderBounce = new PointF(0, 0);

    private final PointF mTranslationForReorderPreview = new PointF(0, 0);

    private float mScaleForReorderBounce = 1f;
@@ -711,6 +713,11 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 


    @Override

    public boolean onTouchEvent(MotionEvent event) {

        if (event.getAction() == MotionEvent.ACTION_DOWN

                && shouldIgnoreTouchDown(event.getX(), event.getY())) {

            return false;

        }



        // Call the superclass onTouchEvent first, because sometimes it changes the state to

        // isPressed() on an ACTION_UP

        super.onTouchEvent(event);
@@ -719,6 +726,15 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 
        return true;

    }



    /**

     * Returns true if the touch down at the provided position be ignored

     */

    protected boolean shouldIgnoreTouchDown(float x, float y) {

        mTouchArea.set(getPaddingLeft(), getPaddingTop(), getWidth() - getPaddingRight(),

                getHeight() - getPaddingBottom());

        return !mTouchArea.contains((int) x, (int) y);

    }



    @Override

    public void cancelLongPress() {

        super.cancelLongPress();