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

Commit e605cd52 authored by LuK1337's avatar LuK1337 Committed by Bruno Martins
Browse files

SystemUI: Fix clock icon blacklist handling 

* This makes sure clock isn't on blacklist before
  calling showClock(animate);

Change-Id: I7f77a83aa6c109e1682d764fb22701375ae5ba1e
parent a62a781d

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

+17 −2
Original line number Diff line number Diff line
@@ -39,13 +39,15 @@ import com.android.systemui.statusbar.policy.EncryptionHelper; 
import com.android.systemui.statusbar.policy.KeyguardMonitor;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;

import com.android.systemui.tuner.TunerService;



/**

 * 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

 * updated by the StatusBarIconController and DarkIconManager while it is attached.

 */

public class CollapsedStatusBarFragment extends Fragment implements CommandQueue.Callbacks {

public class CollapsedStatusBarFragment extends Fragment implements CommandQueue.Callbacks,

        TunerService.Tunable {



    public static final String TAG = "CollapsedStatusBarFragment";

    private static final String EXTRA_PANEL_STATE = "panel_state";
@@ -62,6 +64,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private DarkIconManager mDarkIconManager;

    private View mOperatorNameFrame;

    private ClockController mClockController;

    private boolean mIsClockBlacklisted;



    private SignalCallback mSignalCallback = new SignalCallback() {

        @Override
@@ -76,6 +79,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mKeyguardMonitor = Dependency.get(KeyguardMonitor.class);

        mNetworkController = Dependency.get(NetworkController.class);

        mStatusBarComponent = SysUiServiceProvider.getComponent(getContext(), StatusBar.class);



        Dependency.get(TunerService.class).addTunable(this,

                StatusBarIconController.ICON_BLACKLIST);

    }



    @Override
@@ -129,6 +135,15 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        }

    }



    @Override

    public void onTuningChanged(String key, String newValue) {

        boolean wasClockBlacklisted = mIsClockBlacklisted;

        mIsClockBlacklisted = StatusBarIconController.getIconBlacklist(newValue).contains("clock");

        if (wasClockBlacklisted && !mIsClockBlacklisted) {

            showClock(false);

        }

    }



    public void initNotificationIconArea(NotificationIconAreaController

            notificationIconAreaController) {

        ViewGroup notificationIconArea = mStatusBar.findViewById(R.id.notification_icon_area);
@@ -169,7 +184,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        // visibility to GONE from INVISIBLE or vice versa

        if ((diff1 & DISABLE_CLOCK) != 0 ||

                mClockController.getClock().getVisibility() != clockHiddenMode()) {

            if ((state1 & DISABLE_CLOCK) != 0) {

            if ((state1 & DISABLE_CLOCK) != 0 || mIsClockBlacklisted) {

                hideClock(animate);

            } else {

                showClock(animate);