From a45d120a764b84cdfc2dc408f476414d10278606 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Wed, 29 Jul 2020 10:32:11 +0800
Subject: [PATCH] Migrate wm package in sysui to WM shell lib -
 CarSystemUITest(4-1/n)

Context:
Seperate display listener registration out of constructor to prevent
cirsular initialize problem. Use builder to make sure
DisplayImeController and DisplaySystemBarsController will be initialized
properly.

Refeine DisplaySystemBarsControllerTest to factory pattern

Fix: 161963879
Bug: 161655636
Test: make CarSystemUI
Test: atest DisplaySystemBarsControllerTest
Change-Id: I756c4925c576700e6c262a2ecc8f36164ad6361e
---
 .../android/systemui/wm/DisplaySystemBarsControllerTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/wm/DisplaySystemBarsControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/wm/DisplaySystemBarsControllerTest.java
index 391f75e353828..b65578dbe02c4 100644
--- a/packages/CarSystemUI/tests/src/com/android/systemui/wm/DisplaySystemBarsControllerTest.java
+++ b/packages/CarSystemUI/tests/src/com/android/systemui/wm/DisplaySystemBarsControllerTest.java
@@ -64,13 +64,13 @@ public class DisplaySystemBarsControllerTest extends SysuiTestCase {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mController = new DisplaySystemBarsController(
+        mController = new DisplaySystemBarsController.Builder(
                 mContext,
                 mIWindowManager,
                 mDisplayController,
                 mHandler,
                 mTransactionPool
-        );
+        ).build();
     }
 
     @Test