Add KeyguardStatusViewController

Refactor KeyguardStatusView so that it has a controller that
NotificationPanelViewController can use to manipulate the view. This
CL untangles some of the logic in KeyguardStatusView that should be in
KeyguardClockSwitchController.

No functionality changes.

Test: atest KeyguardClockSwitchControllerTest
Test: atest NotificationPanelViewTest
Test: atest KeyguardStatusViewControllerTest
Test: atest SystemUITests
Change-Id: I52d0d887cb4ce734ec265b6357644ba1d1368460
Bug: 170228350

1 files changed, 1 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
index 2470b958a85f..3be7e0a2b0b3 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
@@ -59,7 +59,6 @@ public class KeyguardSliceViewController implements Dumpable {
     private static final String TAG = "KeyguardSliceViewCtrl";
 
     private final KeyguardSliceView mView;
-    private final KeyguardStatusView mKeyguardStatusView;
     private final ActivityStarter mActivityStarter;
     private final ConfigurationController mConfigurationController;
     private final TunerService mTunerService;
@@ -135,11 +134,10 @@ public class KeyguardSliceViewController implements Dumpable {
 
     @Inject
     public KeyguardSliceViewController(KeyguardSliceView keyguardSliceView,
-            KeyguardStatusView keyguardStatusView, ActivityStarter activityStarter,
+            ActivityStarter activityStarter,
             ConfigurationController configurationController, TunerService tunerService,
             DumpManager dumpManager) {
         mView = keyguardSliceView;
-        mKeyguardStatusView = keyguardStatusView;
         mActivityStarter = activityStarter;
         mConfigurationController = configurationController;
         mTunerService = tunerService;
@@ -153,8 +151,6 @@ public class KeyguardSliceViewController implements Dumpable {
         }
         mView.addOnAttachStateChangeListener(mOnAttachStateChangeListener);
         mView.setOnClickListener(mOnClickListener);
-        // TODO: remove the line below.
-        mKeyguardStatusView.setKeyguardSliceViewController(this);
     }
 
     /**
@@ -233,7 +229,5 @@ public class KeyguardSliceViewController implements Dumpable {
     public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {
         pw.println("  mSlice: " + mSlice);
         pw.println("  mClickActions: " + mClickActions);
-
-        mKeyguardStatusView.dump(fd, pw, args);
     }
 }