Revert "6/N Add Controller for KeyguardPatternView"

Revert submission 12585643-b166448040-keyguard-message-area

Reason for revert: http://b/169081305 & http://b/169020145
Reverted Changes:
I6fa05012c:4/N Setup Controller fo KeyguardSecurityContainer....
Iecf265744:5/N Add KeyguardSecurityViewFlipperController.
I90ab99b2f:6/N Add Controller for KeyguardPatternView
I4b74eddd1:7/N controllers for remaining Keyguard Password Vi...
I805286374:8/N Remove View Injection from KeyguardMessageArea...
I362755980:9/N Clean Up Keyguard Class Structure

Change-Id: I11dff38ad9c36e0de5eec8f6e8662a173e1191cc
Fixes: 169081305
Fixes: 169020145

1 files changed, 4 insertions, 22 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java
index 552e62052e6f..83fcac6579f2 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java
@@ -19,7 +19,6 @@ package com.android.keyguard;
 import android.content.res.ColorStateList;
 import android.view.MotionEvent;
 
-import com.android.internal.util.LatencyTracker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.systemui.util.ViewController;
@@ -28,21 +27,18 @@ import javax.inject.Inject;
 
 
 /** Controller for a {@link KeyguardSecurityView}. */
-public class KeyguardInputViewController<T extends KeyguardInputView> extends ViewController<T>
+public class KeyguardInputViewController extends ViewController<KeyguardInputView>
         implements KeyguardSecurityView {
 
     private final SecurityMode mSecurityMode;
     private final LockPatternUtils mLockPatternUtils;
-    private final KeyguardSecurityCallback mKeyguardSecurityCallback;
-    private KeyguardMessageAreaController mMessageAreaController;
 
-    protected KeyguardInputViewController(T view, SecurityMode securityMode,
+    private KeyguardInputViewController(KeyguardInputView view, SecurityMode securityMode,
             LockPatternUtils lockPatternUtils,
             KeyguardSecurityCallback keyguardSecurityCallback) {
         super(view);
         mSecurityMode = securityMode;
         mLockPatternUtils = lockPatternUtils;
-        mKeyguardSecurityCallback = keyguardSecurityCallback;
         mView.setKeyguardCallback(keyguardSecurityCallback);
     }
 
@@ -147,31 +143,17 @@ public class KeyguardInputViewController<T extends KeyguardInputView> extends Vi
 
     /** Factory for a {@link KeyguardInputViewController}. */
     public static class Factory {
-        private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
         private final LockPatternUtils mLockPatternUtils;
-        private final LatencyTracker mLatencyTracker;
-        private final KeyguardMessageAreaController.Factory mMessageAreaControllerFactory;
 
         @Inject
-        public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,
-                LockPatternUtils lockPatternUtils,
-                LatencyTracker latencyTracker,
-                KeyguardMessageAreaController.Factory messageAreaControllerFactory) {
-            mKeyguardUpdateMonitor = keyguardUpdateMonitor;
+        public Factory(LockPatternUtils lockPatternUtils) {
             mLockPatternUtils = lockPatternUtils;
-            mLatencyTracker = latencyTracker;
-            mMessageAreaControllerFactory = messageAreaControllerFactory;
         }
 
         /** Create a new {@link KeyguardInputViewController}. */
         public KeyguardInputViewController create(KeyguardInputView keyguardInputView,
                 SecurityMode securityMode, KeyguardSecurityCallback keyguardSecurityCallback) {
-            if (keyguardInputView instanceof KeyguardPatternView) {
-                return new KeyguardPatternViewController((KeyguardPatternView) keyguardInputView,
-                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,
-                        keyguardSecurityCallback, mLatencyTracker, mMessageAreaControllerFactory);
-            }
-            return new KeyguardInputViewController<>(keyguardInputView, securityMode,
+            return new KeyguardInputViewController(keyguardInputView, securityMode,
                     mLockPatternUtils, keyguardSecurityCallback);
         }
     }