Add FalsingManager and Classifier to SystemUI
Adds the possibility to analyze and classify touch and sensor events as
human or false touches.
Change-Id: I5079c02406d532fea38ca2d302e8606effae0696
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index cbd23bb..99436a1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -31,7 +31,7 @@
import com.android.keyguard.R;
import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.DejankUtils;
-import com.android.systemui.analytics.LockedPhoneAnalytics;
+import com.android.systemui.classifier.FalsingManager;
import static com.android.keyguard.KeyguardHostView.OnDismissAction;
import static com.android.keyguard.KeyguardSecurityModel.SecurityMode;
@@ -50,7 +50,7 @@
private ViewGroup mRoot;
private boolean mShowingSoon;
private int mBouncerPromptReason;
- private LockedPhoneAnalytics mLockedPhoneAnalytics;
+ private FalsingManager mFalsingManager;
private KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
new KeyguardUpdateMonitorCallback() {
@Override
@@ -68,11 +68,11 @@
mContainer = container;
mWindowManager = windowManager;
KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);
- mLockedPhoneAnalytics = LockedPhoneAnalytics.getInstance(mContext);
+ mFalsingManager = FalsingManager.getInstance(mContext);
}
public void show(boolean resetSecuritySelection) {
- mLockedPhoneAnalytics.onBouncerShown();
+ mFalsingManager.onBouncerShown();
ensureView();
if (resetSecuritySelection) {
// showPrimarySecurityScreen() updates the current security method. This is needed in
@@ -132,7 +132,7 @@
}
public void hide(boolean destroyView) {
- mLockedPhoneAnalytics.onBouncerHidden();
+ mFalsingManager.onBouncerHidden();
cancelShowRunnable();
if (mKeyguardView != null) {
mKeyguardView.cancelDismissAction();
@@ -162,7 +162,7 @@
public void reset() {
cancelShowRunnable();
inflateView();
- mLockedPhoneAnalytics.onBouncerHidden();
+ mFalsingManager.onBouncerHidden();
}
public void onScreenTurnedOff() {
@@ -250,7 +250,7 @@
// We need to show it in case it is secure. If not, it will get dismissed in any case.
mRoot.setVisibility(View.VISIBLE);
- mLockedPhoneAnalytics.onBouncerShown();
+ mFalsingManager.onBouncerShown();
mKeyguardView.requestFocus();
mKeyguardView.onResume();
return true;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index f47ec20..980527b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -22,7 +22,6 @@
import android.animation.PropertyValuesHolder;
import android.animation.ValueAnimator;
import android.app.ActivityManager;
-import android.app.ActivityManager.RunningTaskInfo;
import android.content.Context;
import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
@@ -50,6 +49,7 @@
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
import com.android.systemui.R;
+import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.qs.QSContainer;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.ExpandableNotificationRow;
@@ -59,7 +59,6 @@
import com.android.systemui.statusbar.KeyguardAffordanceView;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.StatusBarState;
-import com.android.systemui.analytics.LockedPhoneAnalytics;
import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
@@ -204,7 +203,7 @@
private boolean mClosingWithAlphaFadeOut;
private boolean mHeadsUpAnimatingAway;
private boolean mLaunchingAffordance;
- private LockedPhoneAnalytics mLockedPhoneAnalytics;
+ private FalsingManager mFalsingManager;
private Runnable mHeadsUpExistenceChangedRunnable = new Runnable() {
@Override
@@ -221,7 +220,7 @@
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
setWillNotDraw(!DEBUG);
- mLockedPhoneAnalytics = LockedPhoneAnalytics.getInstance(context);
+ mFalsingManager = FalsingManager.getInstance(context);
}
public void setStatusBar(PhoneStatusBar bar) {
@@ -813,7 +812,7 @@
private void handleQsDown(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN
&& shouldQuickSettingsIntercept(event.getX(), event.getY(), -1)) {
- mLockedPhoneAnalytics.onQsDown();
+ mFalsingManager.onQsDown();
mQsTracking = true;
onQsExpansionStarted();
mInitialHeightOnTouch = mQsExpansionHeight;
@@ -981,7 +980,7 @@
mQsExpanded = expanded;
updateQsState();
requestPanelHeightUpdate();
- mLockedPhoneAnalytics.setQsExpanded(expanded);
+ mFalsingManager.setQsExpanded(expanded);
mNotificationStackScroller.setInterceptDelegateEnabled(expanded);
mStatusBar.setQsExpanded(expanded);
mQsPanel.setExpanded(expanded);
@@ -1308,7 +1307,7 @@
R.string.accessibility_desc_quick_settings));
mLastAnnouncementWasQuickSettings = true;
}
- if (mQsFullyExpanded && mLockedPhoneAnalytics.shouldEnforceBouncer()) {
+ if (mQsFullyExpanded && mFalsingManager.shouldEnforceBouncer()) {
mStatusBar.executeRunnableDismissingKeyguard(null, null /* cancelAction */,
false /* dismissShade */, true /* afterKeyguardGone */);
}
@@ -1839,7 +1838,7 @@
@Override
protected void onTrackingStarted() {
- mLockedPhoneAnalytics.onTrackingStarted();
+ mFalsingManager.onTrackingStarted();
super.onTrackingStarted();
if (mQsFullyExpanded) {
mQsExpandImmediate = true;
@@ -1853,7 +1852,7 @@
@Override
protected void onTrackingStopped(boolean expand) {
- mLockedPhoneAnalytics.onTrackingStopped();
+ mFalsingManager.onTrackingStopped();
super.onTrackingStopped(expand);
if (expand) {
mNotificationStackScroller.setOverScrolledPixels(
@@ -1953,8 +1952,8 @@
EventLogTags.writeSysuiLockscreenGesture(
EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER, lengthDp, velocityDp);
- mLockedPhoneAnalytics.onLeftAffordanceOn();
- if (mLockedPhoneAnalytics.shouldEnforceBouncer()) {
+ mFalsingManager.onLeftAffordanceOn();
+ if (mFalsingManager.shouldEnforceBouncer()) {
mStatusBar.executeRunnableDismissingKeyguard(new Runnable() {
@Override
public void run() {
@@ -1969,8 +1968,8 @@
EventLogTags.writeSysuiLockscreenGesture(
EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA, lengthDp, velocityDp);
- mLockedPhoneAnalytics.onCameraOn();
- if (mLockedPhoneAnalytics.shouldEnforceBouncer()) {
+ mFalsingManager.onCameraOn();
+ if (mFalsingManager.shouldEnforceBouncer()) {
mStatusBar.executeRunnableDismissingKeyguard(new Runnable() {
@Override
public void run() {
@@ -2024,7 +2023,7 @@
@Override
public void onSwipingStarted(boolean rightIcon) {
- mLockedPhoneAnalytics.onAffordanceSwipingStarted(rightIcon);
+ mFalsingManager.onAffordanceSwipingStarted(rightIcon);
boolean camera = getLayoutDirection() == LAYOUT_DIRECTION_RTL ? !rightIcon
: rightIcon;
if (camera) {
@@ -2037,7 +2036,7 @@
@Override
public void onSwipingAborted() {
- mLockedPhoneAnalytics.onAffordanceSwipingAborted();
+ mFalsingManager.onAffordanceSwipingAborted();
mKeyguardBottomArea.unbindCameraPrewarmService(false /* launched */);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 9cd6ea3..13d0e1e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -35,6 +35,9 @@
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
import com.android.systemui.R;
+import com.android.systemui.classifier.Classifier;
+import com.android.systemui.classifier.FalsingManager;
+import com.android.systemui.classifier.HumanInteractionClassifier;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.statusbar.FlingAnimationUtils;
import com.android.systemui.statusbar.StatusBarState;
@@ -85,6 +88,7 @@
private ObjectAnimator mPeekAnimator;
private VelocityTrackerInterface mVelocityTracker;
private FlingAnimationUtils mFlingAnimationUtils;
+ private FalsingManager mFalsingManager;
/**
* Whether an instant expand request is currently pending and we are just waiting for layout.
@@ -190,6 +194,7 @@
mLinearOutSlowInInterpolator =
AnimationUtils.loadInterpolator(context, android.R.interpolator.linear_out_slow_in);
mBounceInterpolator = new BounceInterpolator();
+ mFalsingManager = FalsingManager.getInstance(context);
}
protected void loadDimens() {
@@ -605,6 +610,9 @@
if (!mStatusBar.isFalsingThresholdNeeded()) {
return false;
}
+ if (mFalsingManager.isFalseTouch(Classifier.UNLOCK)) {
+ return true;
+ }
if (!mTouchAboveFalsingThreshold) {
return true;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 33ebfff..ca16567 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -108,6 +108,7 @@
import com.android.systemui.EventLogTags;
import com.android.systemui.Prefs;
import com.android.systemui.R;
+import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.doze.DozeHost;
import com.android.systemui.doze.DozeLog;
@@ -131,7 +132,6 @@
import com.android.systemui.statusbar.SignalClusterView;
import com.android.systemui.statusbar.SpeedBumpView;
import com.android.systemui.statusbar.StatusBarState;
-import com.android.systemui.analytics.LockedPhoneAnalytics;
import com.android.systemui.statusbar.phone.UnlockMethodCache.OnUnlockMethodChangedListener;
import com.android.systemui.statusbar.policy.AccessibilityController;
import com.android.systemui.statusbar.policy.BatteryController;
@@ -598,7 +598,7 @@
private HashSet<Entry> mHeadsUpEntriesToRemoveOnSwitch = new HashSet<>();
private RankingMap mLatestRankingMap;
private boolean mNoAnimationOnNextBarModeChange;
- private LockedPhoneAnalytics mLockedPhoneAnalytics;
+ private FalsingManager mFalsingManager;
@Override
public void start() {
@@ -646,7 +646,7 @@
notifyUserAboutHiddenNotifications();
mScreenPinningRequest = new ScreenPinningRequest(mContext);
- mLockedPhoneAnalytics = LockedPhoneAnalytics.getInstance(mContext);
+ mFalsingManager = FalsingManager.getInstance(mContext);
}
// ================================================================================
@@ -3805,7 +3805,7 @@
}
mState = state;
mGroupManager.setStatusBarState(state);
- mLockedPhoneAnalytics.setStatusBarState(state);
+ mFalsingManager.setStatusBarState(state);
mStatusBarWindowManager.setStatusBarState(state);
updateDozing();
}
@@ -3827,7 +3827,7 @@
}
public void onUnlockHintStarted() {
- mLockedPhoneAnalytics.onUnlockHintStarted();
+ mFalsingManager.onUnlockHintStarted();
mKeyguardIndicationController.showTransientIndication(R.string.keyguard_unlock);
}
@@ -3837,17 +3837,17 @@
}
public void onCameraHintStarted() {
- mLockedPhoneAnalytics.onCameraHintStarted();
+ mFalsingManager.onCameraHintStarted();
mKeyguardIndicationController.showTransientIndication(R.string.camera_hint);
}
public void onVoiceAssistHintStarted() {
- mLockedPhoneAnalytics.onLeftAffordanceHintStarted();
+ mFalsingManager.onLeftAffordanceHintStarted();
mKeyguardIndicationController.showTransientIndication(R.string.voice_hint);
}
public void onPhoneHintStarted() {
- mLockedPhoneAnalytics.onLeftAffordanceHintStarted();
+ mFalsingManager.onLeftAffordanceHintStarted();
mKeyguardIndicationController.showTransientIndication(R.string.phone_hint);
}
@@ -3922,7 +3922,7 @@
row.setUserExpanded(true);
}
boolean fullShadeNeedsBouncer = !userAllowsPrivateNotificationsInPublic(mCurrentUserId)
- || !mShowLockscreenNotifications || mLockedPhoneAnalytics.shouldEnforceBouncer();
+ || !mShowLockscreenNotifications || mFalsingManager.shouldEnforceBouncer();
if (isLockscreenPublicMode() && fullShadeNeedsBouncer) {
mLeaveOpenOnKeyguardHide = true;
showBouncer();
@@ -3970,7 +3970,7 @@
mDeviceInteractive = false;
mWakeUpComingFromTouch = false;
mWakeUpTouchLocation = null;
- mLockedPhoneAnalytics.onScreenOff();
+ mFalsingManager.onScreenOff();
mStackScroller.setAnimationsEnabled(false);
updateVisibleToUser();
}
@@ -3980,11 +3980,11 @@
mStackScroller.setAnimationsEnabled(true);
mNotificationPanel.setTouchDisabled(false);
updateVisibleToUser();
- mLockedPhoneAnalytics.onScreenOn();
}
public void onScreenTurningOn() {
mScreenTurningOn = true;
+ mFalsingManager.onScreenTurningOn();
mNotificationPanel.onScreenTurningOn();
if (mLaunchCameraOnScreenTurningOn) {
mNotificationPanel.launchCamera(false);
@@ -4119,7 +4119,7 @@
mWakeUpTouchLocation = new PointF(event.getX(), event.getY());
mNotificationPanel.setTouchDisabled(false);
mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested();
- mLockedPhoneAnalytics.onScreenOnFromTouch();
+ mFalsingManager.onScreenOnFromTouch();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index bbf981f..cfd3358 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -36,10 +36,10 @@
import android.widget.FrameLayout;
import com.android.systemui.R;
+import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.DragDownHelper;
import com.android.systemui.statusbar.StatusBarState;
-import com.android.systemui.analytics.LockedPhoneAnalytics;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
@@ -56,14 +56,14 @@
private PhoneStatusBar mService;
private final Paint mTransparentSrcPaint = new Paint();
- private LockedPhoneAnalytics mLockedPhoneAnalytics;
+ private FalsingManager mFalsingManager;
public StatusBarWindowView(Context context, AttributeSet attrs) {
super(context, attrs);
setMotionEventSplittingEnabled(false);
mTransparentSrcPaint.setColor(0);
mTransparentSrcPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
- mLockedPhoneAnalytics = LockedPhoneAnalytics.getInstance(context);
+ mFalsingManager = FalsingManager.getInstance(context);
}
@Override
@@ -200,7 +200,7 @@
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
- mLockedPhoneAnalytics.onTouchEvent(ev, getWidth(), getHeight());
+ mFalsingManager.onTouchEvent(ev, getWidth(), getHeight());
if (mBrightnessMirror != null && mBrightnessMirror.getVisibility() == VISIBLE) {
// Disallow new pointers while the brightness mirror is visible. This is so that you
// can't touch anything other than the brightness slider while the mirror is showing