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

Commit 8143950a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

4/N Remove ZenModeController for QSBarHeader. 

Remove the ZenModeController from the QuickStatusBarHeader.

Test: atest SystemUITests
Bug: 168904199
Change-Id: Icaf9085630f0daec16cb5d86c9552b21a2e9d0e6
parent dbd75e92

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+7 −16
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.systemui.qs; 
import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;



import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;



import android.annotation.ColorInt;

import android.app.AlarmManager;

import android.app.AlarmManager.AlarmClockInfo;
@@ -30,7 +28,6 @@ import android.graphics.Color; 
import android.graphics.Rect;

import android.media.AudioManager;

import android.os.Bundle;

import android.service.notification.ZenModeConfig;

import android.util.AttributeSet;

import android.util.MathUtils;

import android.util.Pair;
@@ -66,8 +63,8 @@ import com.android.systemui.settings.UserTracker; 
import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

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

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

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



import java.util.List;

import java.util.Locale;

import java.util.Objects;
@@ -83,8 +80,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 


    public static final int MAX_TOOLTIP_SHOWN_COUNT = 2;



    private final ZenModeController mZenController;



    private boolean mExpanded;

    private boolean mQsDisabled;
@@ -113,8 +108,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
    private DemoModeController mDemoModeController;

    private DemoMode mDemoModeReceiver;

    private UserTracker mUserTracker;

    private boolean mAllIndicatorsEnabled;

    private boolean mMicCameraIndicatorsEnabled;



    // Used for RingerModeTracker

    private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);
@@ -131,10 +124,8 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 


    @Inject

    public QuickStatusBarHeader(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,

            ZenModeController zenModeController, DemoModeController demoModeController,

            UserTracker userTracker) {

            DemoModeController demoModeController, UserTracker userTracker) {

        super(context, attrs);

        mZenController = zenModeController;

        mDualToneHandler = new DualToneHandler(

                new ContextThemeWrapper(context, R.style.QSHeaderTheme));

        mDemoModeController = demoModeController;
@@ -197,8 +188,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
        return mHeaderQsPanel;

    }



    void updateStatusText(int ringerMode, AlarmClockInfo nextAlarm) {

        boolean changed = updateRingerStatus(ringerMode) || updateAlarmStatus(nextAlarm);

    void updateStatusText(int ringerMode, AlarmClockInfo nextAlarm, boolean zenOverridingRinger) {

        boolean changed = updateRingerStatus(ringerMode, zenOverridingRinger)

                || updateAlarmStatus(nextAlarm);



        if (changed) {

            boolean alarmVisible = mNextAlarmTextView.getVisibility() == View.VISIBLE;
@@ -208,13 +200,12 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
        }

    }



    private boolean updateRingerStatus(int ringerMode) {

    private boolean updateRingerStatus(int ringerMode, boolean zenOverridingRinger) {

        boolean isOriginalVisible = mRingerModeTextView.getVisibility() == View.VISIBLE;

        CharSequence originalRingerText = mRingerModeTextView.getText();



        boolean ringerVisible = false;

        if (!ZenModeConfig.isZenOverridingRinger(mZenController.getZen(),

                mZenController.getConsolidatedPolicy())) {

        if (!zenOverridingRinger) {

            if (ringerMode == AudioManager.RINGER_MODE_VIBRATE) {

                mRingerModeIcon.setImageResource(R.drawable.ic_volume_ringer_vibrate);

                mRingerModeTextView.setText(R.string.qs_status_phone_vibrate);

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java

+9 −5
Original line number Diff line number Diff line
@@ -92,12 +92,12 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
    private final ZenModeController.Callback mZenModeControllerCallback = new Callback() {

        @Override

        public void onZenChanged(int zen) {

            mView.updateStatusText(mRingerMode, mNextAlarm);

            mView.updateStatusText(mRingerMode, mNextAlarm, isZenOverridingRinger());

        }



        @Override

        public void onConfigChanged(ZenModeConfig config) {

            mView.updateStatusText(mRingerMode, mNextAlarm);

            mView.updateStatusText(mRingerMode, mNextAlarm, isZenOverridingRinger());

        }

    };
@@ -105,7 +105,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
        @Override

        public void onNextAlarmChanged(AlarmClockInfo nextAlarm) {

            mNextAlarm = nextAlarm;

            mView.updateStatusText(mRingerMode, mNextAlarm);

            mView.updateStatusText(mRingerMode, mNextAlarm, isZenOverridingRinger());

        }

    };
@@ -216,7 +216,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
    protected void onViewAttached() {

        mRingerModeTracker.getRingerModeInternal().observe(mLifecycleOwner, ringer -> {

            mRingerMode = ringer;

            mView.updateStatusText(mRingerMode, mNextAlarm);

            mView.updateStatusText(mRingerMode, mNextAlarm, isZenOverridingRinger());

        });



        mClockView.setOnClickListener(mOnClickListener);
@@ -308,11 +308,15 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
        return ignored;

    }





    private boolean getChipEnabled() {

        return mMicCameraIndicatorsEnabled || mAllIndicatorsEnabled;

    }



    private boolean isZenOverridingRinger() {

        return ZenModeConfig.isZenOverridingRinger(mZenModeController.getZen(),

                mZenModeController.getConsolidatedPolicy());

    }



    static class Builder {

        private final ZenModeController mZenModeController;

        private final NextAlarmController mNextAlarmController;