From 8b67be845517854b6673086376c8060a2c165172 Mon Sep 17 00:00:00 2001 From: Caitlin Cassidy Date: Mon, 15 Nov 2021 17:55:40 +0000 Subject: [PATCH] [Status Bar Refactor] In CollapsedStatusBarFragment, use NotificationPanelViewController instead of StatusBar.java. This was the last call into StatusBar.java, so marking the bug as fixed. :D Fixes: 204792508 Test: atest SystemUITests Test: manual Change-Id: I021d5d1bb211cf8a8cadad0a202a05566c78ce46 --- .../android/systemui/statusbar/phone/StatusBar.java | 4 ---- .../statusbar/phone/dagger/StatusBarViewModule.java | 6 ------ .../phone/fragment/CollapsedStatusBarFragment.java | 11 +---------- .../fragment/CollapsedStatusBarFragmentTest.java | 5 ----- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 84ef079d2249b..316b99e176deb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1868,10 +1868,6 @@ public class StatusBar extends CoreStartable implements return mDozeServiceHost.isPulsing(); } - public boolean hideStatusBarIconsWhenExpanded() { - return mNotificationPanelViewController.hideStatusBarIconsWhenExpanded(); - } - @Nullable public View getAmbientIndicationContainer() { return mAmbientIndicationContainer; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java index beed60b08d519..26c9458bf3aa9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java @@ -46,7 +46,6 @@ import com.android.systemui.statusbar.phone.NotificationPanelView; import com.android.systemui.statusbar.phone.NotificationPanelViewController; import com.android.systemui.statusbar.phone.NotificationShadeWindowView; import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer; -import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarHideIconsForBouncerManager; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarLocationPublisher; @@ -61,11 +60,8 @@ import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.tuner.TunerService; -import java.util.Optional; - import javax.inject.Named; -import dagger.Lazy; import dagger.Module; import dagger.Provides; @@ -243,7 +239,6 @@ public abstract class StatusBarViewModule { NotificationPanelViewController notificationPanelViewController, NetworkController networkController, StatusBarStateController statusBarStateController, - Lazy> statusBarOptionalLazy, CommandQueue commandQueue, CollapsedStatusBarFragmentLogger collapsedStatusBarFragmentLogger, OperatorNameViewController.Factory operatorNameViewControllerFactory @@ -261,7 +256,6 @@ public abstract class StatusBarViewModule { notificationPanelViewController, networkController, statusBarStateController, - statusBarOptionalLazy, commandQueue, collapsedStatusBarFragmentLogger, operatorNameViewControllerFactory); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index 2762b4cfbaa66..d6ba6f3ff97a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -55,7 +55,6 @@ import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.NotificationPanelViewController; import com.android.systemui.statusbar.phone.PhoneStatusBarView; -import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarHideIconsForBouncerManager; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarIconController.DarkIconManager; @@ -71,12 +70,9 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import javax.inject.Inject; -import dagger.Lazy; - /** * Contains the collapsed status bar and handles hiding/showing based on disable flags * and keyguard state. Also manages lifecycle to make sure the views it contains are being @@ -104,7 +100,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private View mCenteredIconArea; private int mDisabled1; private int mDisabled2; - private Lazy> mStatusBarOptionalLazy; private DarkIconManager mDarkIconManager; private final StatusBarFragmentComponent.Factory mStatusBarFragmentComponentFactory; private final CommandQueue mCommandQueue; @@ -151,7 +146,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue NotificationPanelViewController notificationPanelViewController, NetworkController networkController, StatusBarStateController statusBarStateController, - Lazy> statusBarOptionalLazy, CommandQueue commandQueue, CollapsedStatusBarFragmentLogger collapsedStatusBarFragmentLogger, OperatorNameViewController.Factory operatorNameViewControllerFactory @@ -169,7 +163,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mNotificationPanelViewController = notificationPanelViewController; mNetworkController = networkController; mStatusBarStateController = statusBarStateController; - mStatusBarOptionalLazy = statusBarOptionalLazy; mCommandQueue = commandQueue; mCollapsedStatusBarFragmentLogger = collapsedStatusBarFragmentLogger; mOperatorNameViewControllerFactory = operatorNameViewControllerFactory; @@ -399,10 +392,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private boolean shouldHideNotificationIcons() { - final Optional statusBarOptional = mStatusBarOptionalLazy.get(); if (!mPanelExpansionStateManager.isClosed() - && statusBarOptional.map( - StatusBar::hideStatusBarIconsWhenExpanded).orElse(false)) { + && mNotificationPanelViewController.hideStatusBarIconsWhenExpanded()) { return true; } return mStatusBarHideIconsForBouncerManager.getShouldHideStatusBarIconsForBouncer(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 526f5b7ff6353..b97f053b24b53 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -50,7 +50,6 @@ import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.NotificationPanelViewController; -import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarHideIconsForBouncerManager; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarLocationPublisher; @@ -68,8 +67,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import java.util.Optional; - @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) @SmallTest @@ -85,7 +82,6 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { private NetworkController mNetworkController; private KeyguardStateController mKeyguardStateController; - private final StatusBar mStatusBar = mock(StatusBar.class); private final CommandQueue mCommandQueue = mock(CommandQueue.class); private OperatorNameViewController.Factory mOperatorNameViewControllerFactory; private OperatorNameViewController mOperatorNameViewController; @@ -335,7 +331,6 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mNotificationPanelViewController, mNetworkController, mStatusBarStateController, - () -> Optional.of(mStatusBar), mCommandQueue, new CollapsedStatusBarFragmentLogger( new LogBuffer("TEST", 1, 1, mock(LogcatEchoTracker.class)),