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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20498445

Change-Id: I0351da87d19752c112ba7654bb4670b9f8896b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xiaowen Lei
2022-11-22 17:17:37 +00:00
committed by Automerger Merge Worker
+8 -7
View File
@@ -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;
}