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

Commit 8f221485 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Restore StatusBarStatePolicy." into sc-v2-dev am: b15d09f6 am: 28003e70 

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

Change-Id: I1160c661bfef6a00b3ac489afe22cb97ab6b3d67
parents 4a44eb70 28003e70

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

+4 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ public class StatusBar extends CoreStartable implements 
    private final NotificationsController mNotificationsController;

    private final OngoingCallController mOngoingCallController;

    private final SystemStatusAnimationScheduler mAnimationScheduler;

    private final StatusBarSignalPolicy mStatusBarSignalPolicy;

    private final StatusBarLocationPublisher mStatusBarLocationPublisher;

    private final StatusBarIconController mStatusBarIconController;

    private final StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager;
@@ -699,6 +700,7 @@ public class StatusBar extends CoreStartable implements 
            AutoHideController autoHideController,

            StatusBarWindowController statusBarWindowController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarSignalPolicy statusBarSignalPolicy,

            PulseExpansionHandler pulseExpansionHandler,

            NotificationWakeUpCoordinator notificationWakeUpCoordinator,

            KeyguardBypassController keyguardBypassController,
@@ -876,6 +878,7 @@ public class StatusBar extends CoreStartable implements 
        mWallpaperController = wallpaperController;

        mOngoingCallController = ongoingCallController;

        mAnimationScheduler = animationScheduler;

        mStatusBarSignalPolicy = statusBarSignalPolicy;

        mStatusBarLocationPublisher = locationPublisher;

        mStatusBarIconController = statusBarIconController;

        mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager;
@@ -930,6 +933,7 @@ public class StatusBar extends CoreStartable implements 
            mBubblesOptional.get().setExpandListener(mBubbleExpandListener);

        }



        mStatusBarSignalPolicy.init();

        mKeyguardIndicationController.init();



        mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);

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

+12 −8
Original line number Diff line number Diff line
@@ -73,17 +73,15 @@ public class StatusBarSignalPolicy implements SignalCallback, 
    private boolean mHideWifi;

    private boolean mHideEthernet;

    private boolean mActivityEnabled;

    private boolean mForceHideWifi;



    // Track as little state as possible, and only for padding purposes

    private boolean mIsAirplaneMode = false;

    private boolean mIsWifiEnabled = false;

    private boolean mWifiVisible = false;



    private ArrayList<MobileIconState> mMobileStates = new ArrayList<MobileIconState>();

    private ArrayList<CallIndicatorIconState> mCallIndicatorStates =

            new ArrayList<CallIndicatorIconState>();

    private ArrayList<MobileIconState> mMobileStates = new ArrayList<>();

    private ArrayList<CallIndicatorIconState> mCallIndicatorStates = new ArrayList<>();

    private WifiIconState mWifiIconState = new WifiIconState();

    private boolean mInitialized;



    @Inject

    public StatusBarSignalPolicy(
@@ -113,9 +111,15 @@ public class StatusBarSignalPolicy implements SignalCallback, 
        mSlotCallStrength =

                mContext.getString(com.android.internal.R.string.status_bar_call_strength);

        mActivityEnabled = mContext.getResources().getBoolean(R.bool.config_showActivity);

    }





        tunerService.addTunable(this, StatusBarIconController.ICON_HIDE_LIST);

    /** Call to initilaize and register this classw with the system. */

    public void init() {

        if (mInitialized) {

            return;

        }

        mInitialized = true;

        mTunerService.addTunable(this, StatusBarIconController.ICON_HIDE_LIST);

        mNetworkController.addCallback(this);

        mSecurityController.addCallback(this);

    }
@@ -163,7 +167,7 @@ public class StatusBarSignalPolicy implements SignalCallback, 
            mHideAirplane = hideAirplane;

            mHideMobile = hideMobile;

            mHideEthernet = hideEthernet;

            mHideWifi = hideWifi || mForceHideWifi;

            mHideWifi = hideWifi;

            // Re-register to get new callbacks.

            mNetworkController.removeCallback(this);

            mNetworkController.addCallback(this);

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

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; 
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.StatusBarLocationPublisher;

import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;

import com.android.systemui.statusbar.phone.StatusBarSignalPolicy;

import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentLogger;
@@ -148,6 +149,7 @@ public interface StatusBarPhoneModule { 
            AutoHideController autoHideController,

            StatusBarWindowController statusBarWindowController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarSignalPolicy statusBarSignalPolicy,

            PulseExpansionHandler pulseExpansionHandler,

            NotificationWakeUpCoordinator notificationWakeUpCoordinator,

            KeyguardBypassController keyguardBypassController,
@@ -250,6 +252,7 @@ public interface StatusBarPhoneModule { 
                autoHideController,

                statusBarWindowController,

                keyguardUpdateMonitor,

                statusBarSignalPolicy,

                pulseExpansionHandler,

                notificationWakeUpCoordinator,

                keyguardBypassController,

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

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ public class StatusBarTest extends SysuiTestCase { 
    @Mock private AmbientDisplayConfiguration mAmbientDisplayConfiguration;

    @Mock private NotificationLogger.ExpansionStateLogger mExpansionStateLogger;

    @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @Mock private StatusBarSignalPolicy mStatusBarSignalPolicy;

    @Mock private NotificationShadeWindowView mNotificationShadeWindowView;

    @Mock private BroadcastDispatcher mBroadcastDispatcher;

    @Mock private AssistManager mAssistManager;
@@ -379,6 +380,7 @@ public class StatusBarTest extends SysuiTestCase { 
                mAutoHideController,

                mStatusBarWindowController,

                mKeyguardUpdateMonitor,

                mStatusBarSignalPolicy,

                mPulseExpansionHandler,

                mNotificationWakeUpCoordinator,

                mKeyguardBypassController,