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

Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8cc3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15803463

Change-Id: If3a4ea910a7cef919856c5a4a8fdc933d91a1aa1
This commit is contained in:
TreeHugger Robot
2021-09-17 14:07:00 +00:00
committed by Automerger Merge Worker
parent a0a11e1b02 7326de8cc3
commit 5df2f27ce4
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()) { if (!wasClickableOnDownEvent()) {
return; 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( mVibrator.vibrate(
Process.myUid(), Process.myUid(),
getContext().getOpPackageName(), getContext().getOpPackageName(),
@@ -506,8 +508,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
"lockIcon-onLongPress", "lockIcon-onLongPress",
VIBRATION_SONIFICATION_ATTRIBUTES); VIBRATION_SONIFICATION_ATTRIBUTES);
} }
mDetectedLongPress = true;
onAffordanceClick();
} }
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
@@ -531,15 +531,21 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
return mDownDetected; 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)) { if (mFalsingManager.isFalseTouch(LOCK_ICON)) {
return; return false;
} }
// pre-emptively set to true to hide view // pre-emptively set to true to hide view
mIsBouncerShowing = true; mIsBouncerShowing = true;
updateVisibility(); updateVisibility();
mKeyguardViewController.showBouncer(/* scrim */ true); 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_PRIMARY_DEVIANCE;
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_ZIGZAG_Y_SECONDARY_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.BRIGHTNESS_SLIDER;
import static com.android.systemui.classifier.Classifier.LOCK_ICON;
import static com.android.systemui.classifier.Classifier.SHADE_DRAG; import static com.android.systemui.classifier.Classifier.SHADE_DRAG;
import android.graphics.Point; import android.graphics.Point;
@@ -89,7 +90,9 @@ class ZigZagClassifier extends FalsingClassifier {
Result calculateFalsingResult( Result calculateFalsingResult(
@Classifier.InteractionType int interactionType, @Classifier.InteractionType int interactionType,
double historyBelief, double historyConfidence) { 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); return Result.passed(0);
} }