openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Override Rect#contains() to include bottom right" into ub-launcher3-rvc-dev

This commit is contained in:
Vinit Nayak 2020-05-18 22:21:55 +00:00 committed by Android (Google) Code Review
parent 7cdb4cfecc c40352ef8c
commit 4ae95beb9b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
View File

@ -317,13 +317,6 @@ class OrientationTouchTransformer {
private class OrientationRectF extends RectF { private class OrientationRectF extends RectF {
/**
* Delta to subtract width and height by because if we report the translated touch
* bounds as the width and height, calling {@link RectF#contains(float, float)} will
* be false
*/
private float maxDelta = 0.001f;
private int mRotation; private int mRotation;
private float mHeight; private float mHeight;
private float mWidth; private float mWidth;
@ -331,8 +324,8 @@ class OrientationTouchTransformer {
OrientationRectF(float left, float top, float right, float bottom, int rotation) { OrientationRectF(float left, float top, float right, float bottom, int rotation) {
super(left, top, right, bottom); super(left, top, right, bottom);
this.mRotation = rotation; this.mRotation = rotation;
mHeight = bottom - maxDelta; mHeight = bottom;
mWidth = right - maxDelta; mWidth = right;
} }
@Override @Override
@ -342,6 +335,13 @@ class OrientationTouchTransformer {
return s; return s;
} }
@Override
public boolean contains(float x, float y) {
// Mark bottom right as included in the Rect (copied from Rect src, added "=" in "<=")
return left < right && top < bottom // check for empty first
&& x >= left && x <= right && y >= top && y <= bottom;
}
boolean applyTransform(MotionEvent event, boolean forceTransform) { boolean applyTransform(MotionEvent event, boolean forceTransform) {
mTmpMatrix.reset(); mTmpMatrix.reset();
postDisplayRotation(deltaRotation(mCurrentDisplayRotation, mRotation), postDisplayRotation(deltaRotation(mCurrentDisplayRotation, mRotation),