commit 4a4ec0f70e49a97795d0f22cef325d544537b280
author yinxu <yinxu@google.com> Thu May 06 08:34:43 2021 -0700
committer yinxu <yinxu@google.com> Thu May 06 08:59:46 2021 -0700
tree 5be5331df6ffd26a6ca15f58eada8cd672f93fdc
parent 0f0edf760b32cf5d4e89a803a1f485447759c982

Inject the StatusBarSignalPolicy in CarSystemBar

Cherry-picked from ag/14445021

Bug: 181667933
Test: Manual tests
Change-Id: I9300650edfefb16ba6936279182bbc547b72c87a
Merged-In: I9300650edfefb16ba6936279182bbc547b72c87a

src/com/android/systemui/car/systembar/CarSystemBar.java

diff --git a/src/com/android/systemui/car/systembar/CarSystemBar.java b/src/com/android/systemui/car/systembar/CarSystemBar.java
index 64bdc31..805e7a1 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBar.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBar.java
@@ -25,9 +25,7 @@
 import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.inputmethodservice.InputMethodService;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.view.Display;
@@ -54,7 +52,6 @@
 import com.android.systemui.statusbar.phone.BarTransitions;
 import com.android.systemui.statusbar.phone.LightBarController;
 import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
-import com.android.systemui.statusbar.phone.StatusBarIconController;
 import com.android.systemui.statusbar.phone.StatusBarSignalPolicy;
 import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -82,8 +79,6 @@
     private final IStatusBarService mBarService;
     private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;
     private final Lazy<PhoneStatusBarPolicy> mIconPolicyLazy;
-    private final Lazy<StatusBarIconController> mIconControllerLazy;
-
     private final int mDisplayId;
     private final SystemBarConfigs mSystemBarConfigs;
 
@@ -137,7 +132,7 @@
             IStatusBarService barService,
             Lazy<KeyguardStateController> keyguardStateControllerLazy,
             Lazy<PhoneStatusBarPolicy> iconPolicyLazy,
-            Lazy<StatusBarIconController> iconControllerLazy,
+            StatusBarSignalPolicy signalPolicy,
             SystemBarConfigs systemBarConfigs
     ) {
         super(context);
@@ -153,9 +148,8 @@
         mBarService = barService;
         mKeyguardStateControllerLazy = keyguardStateControllerLazy;
         mIconPolicyLazy = iconPolicyLazy;
-        mIconControllerLazy = iconControllerLazy;
         mSystemBarConfigs = systemBarConfigs;
-
+        mSignalPolicy = signalPolicy;
         mDisplayId = context.getDisplayId();
     }
 
@@ -260,9 +254,6 @@
         // mIconPolicy.init().
         mExecutor.execute(() -> {
             mIconPolicyLazy.get().init();
-            if (mSignalPolicy == null) {
-                mSignalPolicy = new StatusBarSignalPolicy(mContext, mIconControllerLazy.get());
-            }
         });
     }
 

tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java

diff --git a/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java b/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
index d7ee62b..709025f 100644
--- a/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
+++ b/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
@@ -145,7 +145,7 @@
                 mStatusBarIconController, mWindowManager, mDeviceProvisionedController,
                 new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener,
                 mExecutor, mUiBgExecutor, mBarService, () -> mKeyguardStateController,
-                () -> mIconPolicy, () -> mIconController,
+                () -> mIconPolicy, mSignalPolicy,
                 new SystemBarConfigs(mTestableResources.getResources()));
         mCarSystemBar.setSignalPolicy(mSignalPolicy);
     }