commit 2b4c3a08fcfcb60c527a1a372318e5ef4ce2d49c
author Eliot Courtney <edcourtney@google.com> Mon Nov 27 13:27:46 2017 +0900
committer Eliot Courtney <edcourtney@google.com> Tue Dec 26 16:43:53 2017 +0900
tree 17caad9d703ff3010a3171b48f4a6334f00a0f67
parent a6d8cf294dfb587f130fdecc5e6897e75de7bf45

Split NotificationViewHierarchyManager out of StatusBar.

NotificationViewHierarchyManager handles bundling and unbundling of
notifications. In doing so, which notifications are parents/children of
the other can change. NotificationViewHierarchyManager makes sure the
view hierarchy of the notifications matches their grouping.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: Ia1c8ed75d4eb8df52897c5d6aa0713f8335b2a19

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index c32e089..47148a4 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -32,12 +32,14 @@
 import com.android.systemui.statusbar.KeyguardIndicationController;
 import com.android.systemui.statusbar.NotificationEntryManager;
 import com.android.systemui.statusbar.NotificationGutsManager;
-import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationListener;
+import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationLogger;
 import com.android.systemui.statusbar.NotificationMediaManager;
 import com.android.systemui.statusbar.NotificationRemoteInputManager;
+import com.android.systemui.statusbar.NotificationViewHierarchyManager;
 import com.android.systemui.statusbar.ScrimView;
+import com.android.systemui.statusbar.notification.VisualStabilityManager;
 import com.android.systemui.statusbar.phone.DozeParameters;
 import com.android.systemui.statusbar.phone.KeyguardBouncer;
 import com.android.systemui.statusbar.phone.LightBarController;
@@ -122,6 +124,7 @@
             Context context) {
         providers.put(NotificationLockscreenUserManager.class,
                 () -> new NotificationLockscreenUserManager(context));
+        providers.put(VisualStabilityManager.class, VisualStabilityManager::new);
         providers.put(NotificationGroupManager.class, NotificationGroupManager::new);
         providers.put(NotificationMediaManager.class, () -> new NotificationMediaManager(context));
         providers.put(NotificationGutsManager.class, () -> new NotificationGutsManager(
@@ -134,6 +137,12 @@
         providers.put(NotificationLogger.class, () -> new NotificationLogger(
                 Dependency.get(NotificationListener.class),
                 Dependency.get(UiOffloadThread.class)));
+        providers.put(NotificationViewHierarchyManager.class, () ->
+                new NotificationViewHierarchyManager(
+                        Dependency.get(NotificationLockscreenUserManager.class),
+                        Dependency.get(NotificationGroupManager.class),
+                        Dependency.get(VisualStabilityManager.class),
+                        context));
         providers.put(NotificationEntryManager.class, () ->
                 new NotificationEntryManager(
                         Dependency.get(NotificationLockscreenUserManager.class),
@@ -145,9 +154,8 @@
                         Dependency.get(NotificationListener.class),
                         Dependency.get(MetricsLogger.class),
                         Dependency.get(DeviceProvisionedController.class),
+                        Dependency.get(VisualStabilityManager.class),
                         Dependency.get(UiOffloadThread.class),
                         context));
-        providers.put(NotificationListener.class, () -> new NotificationListener(
-                Dependency.get(NotificationRemoteInputManager.class), context));
     }
 }