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

Merge "Add full unlock gesture to FalsingManager" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-09 22:09:20 +00:00
committed by Android (Google) Code Review
parent 0d66083f7c 81e1ffd406
commit 2ea09f069d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java
View File

@@ -74,6 +74,7 @@ public class FalsingManager implements SensorEventListener {
private boolean mEnforceBouncer = false; private boolean mEnforceBouncer = false;
private boolean mBouncerOn = false; private boolean mBouncerOn = false;
private boolean mBouncerOffOnDown = false;
private boolean mSessionActive = false; private boolean mSessionActive = false;
private boolean mIsTouchScreen = true; private boolean mIsTouchScreen = true;
private int mState = StatusBarState.SHADE; private int mState = StatusBarState.SHADE;
@@ -459,10 +460,19 @@ public class FalsingManager implements SensorEventListener {
public void onTouchEvent(MotionEvent event, int width, int height) { public void onTouchEvent(MotionEvent event, int width, int height) {
if (event.getAction() == MotionEvent.ACTION_DOWN) { if (event.getAction() == MotionEvent.ACTION_DOWN) {
mIsTouchScreen = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN); mIsTouchScreen = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN);
// If the bouncer was not shown during the down event,
// we want the entire gesture going to HumanInteractionClassifier
mBouncerOffOnDown = !mBouncerOn;
} }
if (mSessionActive && !mBouncerOn) { if (mSessionActive) {
mDataCollector.onTouchEvent(event, width, height); if (!mBouncerOn) {
mHumanInteractionClassifier.onTouchEvent(event); // In case bouncer is "visible", but onFullyShown has not yet been called,
// avoid adding the event to DataCollector
mDataCollector.onTouchEvent(event, width, height);
}
if (mBouncerOffOnDown) {
mHumanInteractionClassifier.onTouchEvent(event);
}
} }
} }