Rely on a falsing-belief event to reset lockscreen

Individual components of the lock screen are now simply in charge of
asking the FalsingManager to recognize certain types of gestures. If
they don't ask, the FalsingManager will assume they were accidental.

Once a certain number of accidental touches occur, an event is fired
that signals that the lock screen should be reset.

More tuning and adjustment to come, but this is now functional.

This also fixes a bug in an earlier cl where the bouncer would no
longer retract if touches outside of its region were detected.

Bug: 172655679
Test: manual
Change-Id: Iffd1c7e58365235b1b7dbdac0c74439ead1df9d3

1 files changed, 4 insertions, 22 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
index 7eac9034f02a..ccba1d59c8d0 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
@@ -48,7 +48,6 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.keyguard.dagger.KeyguardBouncerScope;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.systemui.Gefingerpoken;
-import com.android.systemui.plugins.FalsingManager;
 import com.android.systemui.shared.system.SysUiStatsLog;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -74,8 +73,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
     private final KeyguardSecurityViewFlipperController mSecurityViewFlipperController;
     private final SecurityCallback mSecurityCallback;
     private final ConfigurationController mConfigurationController;
-    private final KeyguardViewController mKeyguardViewController;
-    private final FalsingManager mFalsingManager;
 
     private SecurityMode mCurrentSecurityMode = SecurityMode.Invalid;
 
@@ -97,13 +94,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
                 }
                 mTouchDown = MotionEvent.obtain(ev);
             } else if (mTouchDown != null) {
-                boolean tapResult = mFalsingManager.isFalseTap(true, 0.6);
-                if (tapResult
-                        || ev.getActionMasked() == MotionEvent.ACTION_UP
+                if (ev.getActionMasked() == MotionEvent.ACTION_UP
                         || ev.getActionMasked() == MotionEvent.ACTION_CANCEL) {
-                    if (tapResult) {
-                        mKeyguardViewController.reset(true);
-                    }
                     mTouchDown.recycle();
                     mTouchDown = null;
                 }
@@ -207,9 +199,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
             KeyguardStateController keyguardStateController,
             SecurityCallback securityCallback,
             KeyguardSecurityViewFlipperController securityViewFlipperController,
-            ConfigurationController configurationController,
-            KeyguardViewController keyguardViewController,
-            FalsingManager falsingManager) {
+            ConfigurationController configurationController) {
         super(view);
         mLockPatternUtils = lockPatternUtils;
         mUpdateMonitor = keyguardUpdateMonitor;
@@ -222,8 +212,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
         mAdminSecondaryLockScreenController = adminSecondaryLockScreenControllerFactory.create(
                 mKeyguardSecurityCallback);
         mConfigurationController = configurationController;
-        mKeyguardViewController = keyguardViewController;
-        mFalsingManager = falsingManager;
     }
 
     @Override
@@ -523,8 +511,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
         private final KeyguardStateController mKeyguardStateController;
         private final KeyguardSecurityViewFlipperController mSecurityViewFlipperController;
         private final ConfigurationController mConfigurationController;
-        private final KeyguardViewController mKeyguardViewController;
-        private final FalsingManager mFalsingManager;
 
         @Inject
         Factory(KeyguardSecurityContainer view,
@@ -537,9 +523,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
                 UiEventLogger uiEventLogger,
                 KeyguardStateController keyguardStateController,
                 KeyguardSecurityViewFlipperController securityViewFlipperController,
-                ConfigurationController configurationController,
-                KeyguardViewController keyguardViewController,
-                FalsingManager falsingManager) {
+                ConfigurationController configurationController) {
             mView = view;
             mAdminSecondaryLockScreenControllerFactory = adminSecondaryLockScreenControllerFactory;
             mLockPatternUtils = lockPatternUtils;
@@ -550,8 +534,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
             mKeyguardStateController = keyguardStateController;
             mSecurityViewFlipperController = securityViewFlipperController;
             mConfigurationController = configurationController;
-            mKeyguardViewController = keyguardViewController;
-            mFalsingManager = falsingManager;
         }
 
         public KeyguardSecurityContainerController create(
@@ -560,7 +542,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
                     mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils,
                     mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,
                     mKeyguardStateController, securityCallback, mSecurityViewFlipperController,
-                    mConfigurationController, mKeyguardViewController, mFalsingManager);
+                    mConfigurationController);
         }
 
     }