Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9404eb15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar Refactor] In CollapsedStatusBarFragment, use... 

Merge "[Status Bar Refactor] In CollapsedStatusBarFragment, use NotificationPanelViewController instead of StatusBar.java." into sc-v2-dev am: 0574e37a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16263520

Change-Id: Ibc716938b8f650196844a5023323d1bf689ec815
parents 712c6095 0574e37a

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+0 −4
Original line number Diff line number Diff line
@@ -1861,10 +1861,6 @@ public class StatusBar extends SystemUI implements 
        return mDozeServiceHost.isPulsing();

    }



    public boolean hideStatusBarIconsWhenExpanded() {

        return mNotificationPanelViewController.hideStatusBarIconsWhenExpanded();

    }



    @Nullable

    public View getAmbientIndicationContainer() {

        return mAmbientIndicationContainer;

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −6
Original line number Diff line number Diff line
@@ -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;
@@ -62,11 +61,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;
@@ -253,7 +249,6 @@ public abstract class StatusBarViewModule { 
            NotificationIconAreaController notificationIconAreaController,

            PanelExpansionStateManager panelExpansionStateManager,

            FeatureFlags featureFlags,

            Lazy<Optional<StatusBar>> statusBarOptionalLazy,

            StatusBarIconController statusBarIconController,

            StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,

            KeyguardStateController keyguardStateController,
@@ -271,7 +266,6 @@ public abstract class StatusBarViewModule { 
                notificationIconAreaController,

                panelExpansionStateManager,

                featureFlags,

                statusBarOptionalLazy,

                statusBarIconController,

                statusBarHideIconsForBouncerManager,

                keyguardStateController,

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+1 −10
Original line number Diff line number Diff line
@@ -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<Optional<StatusBar>> mStatusBarOptionalLazy;

    private DarkIconManager mDarkIconManager;

    private final StatusBarFragmentComponent.Factory mStatusBarFragmentComponentFactory;

    private final CommandQueue mCommandQueue;
@@ -145,7 +140,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
            NotificationIconAreaController notificationIconAreaController,

            PanelExpansionStateManager panelExpansionStateManager,

            FeatureFlags featureFlags,

            Lazy<Optional<StatusBar>> statusBarOptionalLazy,

            StatusBarIconController statusBarIconController,

            StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,

            KeyguardStateController keyguardStateController,
@@ -163,7 +157,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mNotificationIconAreaController = notificationIconAreaController;

        mPanelExpansionStateManager = panelExpansionStateManager;

        mFeatureFlags = featureFlags;

        mStatusBarOptionalLazy = statusBarOptionalLazy;

        mStatusBarIconController = statusBarIconController;

        mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager;

        mKeyguardStateController = keyguardStateController;
@@ -399,10 +392,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    }



    private boolean shouldHideNotificationIcons() {

        final Optional<StatusBar> statusBarOptional = mStatusBarOptionalLazy.get();

        if (!mPanelExpansionStateManager.isClosed()

                && statusBarOptional.map(

                        StatusBar::hideStatusBarIconsWhenExpanded).orElse(false)) {

                && mNotificationPanelViewController.hideStatusBarIconsWhenExpanded()) {

            return true;

        }

        return mStatusBarHideIconsForBouncerManager.getShouldHideStatusBarIconsForBouncer();

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java

+0 −5
Original line number Diff line number Diff line
@@ -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;
@@ -328,7 +324,6 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { 
                mMockNotificationAreaController,

                new PanelExpansionStateManager(),

                mock(FeatureFlags.class),

                () -> Optional.of(mStatusBar),

                mStatusBarIconController,

                new StatusBarHideIconsForBouncerManager(

                        mCommandQueue, new FakeExecutor(new FakeSystemClock()), new DumpManager()),