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

Remove ZigZagClassifer from lock-icon longpress falsing algo

Browse Source 
If the touch leaves the lock icon area, we already drop the touch.
Therefore, we don't also need to also take into consideration the
ZigZagClassifier for the lock icon.

Also, only play the longpress vibration if we will be bringing
up the bouncer. If the FalsingManager think we're falsing, there's no reason to play
the longpress vibration.

Test: manually longpress lock icon on device with
udfps capability (after lockdown or reboot) and observe
longpress consistently brings up the bouncer
Fixes: 197271526

Change-Id: Ic9fa82a549599e48d281b4db69c04627803c6c5a
Merged-In: Ic9fa82a549599e48d281b4db69c04627803c6c5a
(cherry picked from commit 374f321fca)
This commit is contained in:
Beverly
2021-08-26 12:19:57 -04:00
committed by Beverly Tai
parent fd48e9f7e5
commit e77ab2c109
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -497,8 +497,10 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
if (!wasClickableOnDownEvent()) {
return;
}
mDetectedLongPress = true;
if (mVibrator != null) {
if (onAffordanceClick() && mVibrator != null) {
// only vibrate if the click went through and wasn't intercepted by falsing
mVibrator.vibrate(
Process.myUid(),
getContext().getOpPackageName(),
@@ -506,8 +508,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
"lockIcon-onLongPress",
VIBRATION_SONIFICATION_ATTRIBUTES);
}
mDetectedLongPress = true;
onAffordanceClick();
}
public boolean onSingleTapUp(MotionEvent e) {
@@ -531,15 +531,21 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
return mDownDetected;
}
private void onAffordanceClick() {
/**
* Whether we tried to launch the affordance.
*
* If falsing intercepts the click, returns false.
*/
private boolean onAffordanceClick() {
if (mFalsingManager.isFalseTouch(LOCK_ICON)) {
return;
return false;
}
// pre-emptively set to true to hide view
mIsBouncerShowing = true;
updateVisibility();
mKeyguardViewController.showBouncer(/* scrim */ true);
return true;
}
});

5
packages/SystemUI/src/com/android/systemui/classifier/ZigZagClassifier.java
View File

@@ -21,6 +21,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_ZIGZAG_Y_PRIMARY_DEVIANCE;
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_ZIGZAG_Y_SECONDARY_DEVIANCE;
import static com.android.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;
import static com.android.systemui.classifier.Classifier.LOCK_ICON;
import static com.android.systemui.classifier.Classifier.SHADE_DRAG;
import android.graphics.Point;
@@ -89,7 +90,9 @@ class ZigZagClassifier extends FalsingClassifier {
Result calculateFalsingResult(
@Classifier.InteractionType int interactionType,
double historyBelief, double historyConfidence) {
if (interactionType == BRIGHTNESS_SLIDER || interactionType == SHADE_DRAG) {
if (interactionType == BRIGHTNESS_SLIDER
|| interactionType == SHADE_DRAG
|| interactionType == LOCK_ICON) {
return Result.passed(0);
}