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

Commit 8eb1c3bd authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge "Fix issue in RTL where swipes on Launcher Smartspace are intercepted." into tm-qpr-dev

parents 654ba7f6 6d66ad20

src/com/android/launcher3/Workspace.java

+8 −7
Original line number Diff line number Diff line
@@ -1074,13 +1074,14 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 
        mXDown = ev.getX();

        mYDown = ev.getY();

        if (mFirstPagePinnedItem != null) {

            mTempFXY[0] = mXDown + getScrollX();

            mTempFXY[1] = mYDown + getScrollY();

            Utilities.mapCoordInSelfToDescendant(mFirstPagePinnedItem, this, mTempFXY);

            mIsEventOverFirstPagePinnedItem = mFirstPagePinnedItem.getLeft() <= mTempFXY[0]

                    && mFirstPagePinnedItem.getRight() >= mTempFXY[0]

                    && mFirstPagePinnedItem.getTop() <= mTempFXY[1]

                    && mFirstPagePinnedItem.getBottom() >= mTempFXY[1];

            final float[] tempFXY = new float[2];

            tempFXY[0] = mXDown;

            tempFXY[1] = mYDown;

            Utilities.mapCoordInSelfToDescendant(mFirstPagePinnedItem, this, tempFXY);

            mIsEventOverFirstPagePinnedItem = mFirstPagePinnedItem.getLeft() <= tempFXY[0]

                    && mFirstPagePinnedItem.getRight() >= tempFXY[0]

                    && mFirstPagePinnedItem.getTop() <= tempFXY[1]

                    && mFirstPagePinnedItem.getBottom() >= tempFXY[1];

        } else {

            mIsEventOverFirstPagePinnedItem = false;

        }