PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid mis-trigger when motion do not endup within system gesture region

Browse Source 
Previously, mOneHandedModeRegion reference larger gesture hieght
"navigation_bar_gesture_larger_height" for the detect region which
will easily introduce mis-trigger above NavBar panel region

Now we add 1 more condition to ensure user end up the motion in NavBar
region for both OHM & Swipe Notification gesture

Test: atest WMShellUnitTests
Test: NexusLauncher:connectedGoogleWithQuickstepDebugAndroidTest
Bug: 179957109
Change-Id: Ibceab87cd17fd8988f39c6c1746829d73623e4f1
This commit is contained in:
Bill Lin
2021-03-05 13:28:55 +08:00
parent 39938cbc94
commit 2ae5f20269
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+19 -1
View File
@@ -21,14 +21,18 @@ import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_MOVE;
import static android.view.MotionEvent.ACTION_UP;
import static com.android.launcher3.ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE;
import static com.android.launcher3.Utilities.squaredHypot;
import android.content.Context;
import android.graphics.Point;
import android.graphics.PointF;
import android.view.MotionEvent;
import com.android.launcher3.R;
import com.android.launcher3.ResourceUtils;
import com.android.launcher3.Utilities;
import com.android.launcher3.util.DisplayController;
import com.android.quickstep.InputConsumer;
import com.android.quickstep.RecentsAnimationDeviceState;
import com.android.quickstep.SystemUiProxy;
@@ -45,11 +49,15 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
private static final int ANGLE_MIN = 30;
private final Context mContext;
private final DisplayController.DisplayHolder mDisplayHolder;
private final Point mDisplaySize;
private final RecentsAnimationDeviceState mDeviceState;
private final float mDragDistThreshold;
private final float mSquaredSlop;
private final int mNavBarSize;
private final PointF mDownPos = new PointF();
private final PointF mLastPos = new PointF();
@@ -60,10 +68,14 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
InputConsumer delegate, InputMonitorCompat inputMonitor) {
super(delegate, inputMonitor);
mContext = context;
mDisplayHolder = DisplayController.getDefaultDisplay(mContext);
mDeviceState = deviceState;
mDragDistThreshold = context.getResources().getDimensionPixelSize(
R.dimen.gestures_onehanded_drag_threshold);
mSquaredSlop = Utilities.squaredTouchSlop(context);
mDisplaySize = mDisplayHolder.getInfo().realSize;
mNavBarSize = ResourceUtils.getNavbarSize(NAVBAR_BOTTOM_GESTURE_SIZE,
mContext.getResources());
}
@Override
@@ -96,7 +108,8 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))
|| (mDeviceState.isOneHandedModeActive() && isValidExitAngle(
mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))) {
mPassedSlop = true;
// To avoid mis-trigger when motion not touch system gesture region.
mPassedSlop = isInSystemGestureRegion(mLastPos);
setActive(ev);
} else {
mState = STATE_DELEGATE_ACTIVE;
@@ -154,6 +167,11 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
}
private boolean isInSystemGestureRegion(PointF lastPos) {
final int navBarUpperBound = mDisplaySize.y - mNavBarSize;
return mDeviceState.isGesturalNavMode() && lastPos.y > navBarUpperBound;
}
private boolean isValidStartAngle(float deltaX, float deltaY) {
final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);