Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support 3-finger swipe on the trackpad to unlock" into udc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2023-03-08 05:27:57 +00:00
committed by Android (Google) Code Review
parent d2be400fe7 ff6800b9a9
commit fd8bfb6d14
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.shade; package com.android.systemui.shade;
import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;
import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE;
import static android.view.View.INVISIBLE; import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
@@ -305,6 +306,7 @@ public final class NotificationPanelViewController implements Dumpable {
*/ */
public final boolean mAnimateBack; public final boolean mAnimateBack;
private final boolean mTrackpadGestureBack;
/** /**
* The minimum scale to "squish" the Shade and associated elements down to, for Back gesture * The minimum scale to "squish" the Shade and associated elements down to, for Back gesture
*/ */
@@ -849,6 +851,7 @@ public final class NotificationPanelViewController implements Dumpable {
mLayoutInflater = layoutInflater; mLayoutInflater = layoutInflater;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mAnimateBack = mFeatureFlags.isEnabled(Flags.WM_SHADE_ANIMATE_BACK_GESTURE); mAnimateBack = mFeatureFlags.isEnabled(Flags.WM_SHADE_ANIMATE_BACK_GESTURE);
mTrackpadGestureBack = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_BACK);
mFalsingCollector = falsingCollector; mFalsingCollector = falsingCollector;
mPowerManager = powerManager; mPowerManager = powerManager;
mWakeUpCoordinator = coordinator; mWakeUpCoordinator = coordinator;
@@ -4763,6 +4766,9 @@ public final class NotificationPanelViewController implements Dumpable {
addMovement(event); addMovement(event);
break; break;
case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_UP:
if (isTrackpadMotionEvent(event)) {
break;
}
final int upPointer = event.getPointerId(event.getActionIndex()); final int upPointer = event.getPointerId(event.getActionIndex());
if (mTrackingPointer == upPointer) { if (mTrackingPointer == upPointer) {
// gesture is ongoing, find a new pointer to track // gesture is ongoing, find a new pointer to track
@@ -4776,7 +4782,8 @@ public final class NotificationPanelViewController implements Dumpable {
mShadeLog.logMotionEventStatusBarState(event, mShadeLog.logMotionEventStatusBarState(event,
mStatusBarStateController.getState(), mStatusBarStateController.getState(),
"onInterceptTouchEvent: pointer down action"); "onInterceptTouchEvent: pointer down action");
if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) { if (!isTrackpadMotionEvent(event)
&& mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
mMotionAborted = true; mMotionAborted = true;
mVelocityTracker.clear(); mVelocityTracker.clear();
} }
@@ -4979,6 +4986,9 @@ public final class NotificationPanelViewController implements Dumpable {
break; break;
case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_UP:
if (isTrackpadMotionEvent(event)) {
break;
}
final int upPointer = event.getPointerId(event.getActionIndex()); final int upPointer = event.getPointerId(event.getActionIndex());
if (mTrackingPointer == upPointer) { if (mTrackingPointer == upPointer) {
// gesture is ongoing, find a new pointer to track // gesture is ongoing, find a new pointer to track
@@ -4995,7 +5005,8 @@ public final class NotificationPanelViewController implements Dumpable {
mShadeLog.logMotionEventStatusBarState(event, mShadeLog.logMotionEventStatusBarState(event,
mStatusBarStateController.getState(), mStatusBarStateController.getState(),
"handleTouch: pointer down action"); "handleTouch: pointer down action");
if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) { if (!isTrackpadMotionEvent(event)
&& mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
mMotionAborted = true; mMotionAborted = true;
endMotionEvent(event, x, y, true /* forceCancel */); endMotionEvent(event, x, y, true /* forceCancel */);
return false; return false;
@@ -5069,6 +5080,11 @@ public final class NotificationPanelViewController implements Dumpable {
} }
return !mGestureWaitForTouchSlop || mTracking; return !mGestureWaitForTouchSlop || mTracking;
} }
private boolean isTrackpadMotionEvent(MotionEvent ev) {
return mTrackpadGestureBack
&& ev.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE;
}
} }
static class SplitShadeTransitionAdapter extends Transition { static class SplitShadeTransitionAdapter extends Transition {