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

Commit ba30f6bf authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b168904199-qs-injection" 

* changes:
  6/N Remove UserTracker from QSBarHeader
  5/N Remove DemoModecontroller from QSBarHeader
  4/N Remove ZenModeController for QSBarHeader.
  3/N Move PrivacyItemController out of QSBarHeader.
  2/N Remove SBIconCtrl and CommandQueue from QSBarHeader.
  1/N Remove Injection from QSSBHeader
parents a080261e 3387ca4b

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

+19 −5
Original line number Diff line number Diff line
@@ -17,30 +17,44 @@ 
package com.android.systemui.qs;



import com.android.systemui.R;

import com.android.systemui.util.ViewController;



import javax.inject.Inject;



public class QSContainerImplController {

    private final QSContainerImpl mView;

class QSContainerImplController extends ViewController<QSContainerImpl> {

    private final QuickStatusBarHeaderController mQuickStatusBarHeaderController;



    private QSContainerImplController(QSContainerImpl view,

            QuickStatusBarHeaderController.Builder quickStatusBarHeaderControllerBuilder) {

        mView = view;

        super(view);

        mQuickStatusBarHeaderController = quickStatusBarHeaderControllerBuilder

                .setQuickStatusBarHeader(mView.findViewById(R.id.header)).build();

    }



    @Override

    public void init() {

        super.init();

        mQuickStatusBarHeaderController.init();

    }



    public void setListening(boolean listening) {

        mQuickStatusBarHeaderController.setListening(listening);

    }



    public static class Builder {

    @Override

    protected void onViewAttached() {

    }



    @Override

    protected void onViewDetached() {

    }



    static class Builder {

        private final QuickStatusBarHeaderController.Builder mQuickStatusBarHeaderControllerBuilder;

        private QSContainerImpl mView;



        @Inject

        public Builder(

        Builder(

                QuickStatusBarHeaderController.Builder quickStatusBarHeaderControllerBuilder) {

            mQuickStatusBarHeaderControllerBuilder = quickStatusBarHeaderControllerBuilder;

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        mQSContainerImplController = mQSContainerImplControllerBuilder

                .setQSContainerImpl((QSContainerImpl) view)

                .build();



        mQSContainerImplController.init();



        mQSDetail.setQsPanel(mQSPanel, mHeader, (View) mFooter);

        mQSAnimator = new QSAnimator(this, mHeader.findViewById(R.id.quick_qs_panel), mQSPanel);
@@ -367,14 +367,13 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        if (DEBUG) Log.d(TAG, "setListening " + listening);

        mListening = listening;

        mQSContainerImplController.setListening(listening);

        mHeader.setListening(listening);

        mFooter.setListening(listening);

        mQSPanel.setListening(mListening, mQsExpanded);

    }



    @Override

    public void setHeaderListening(boolean listening) {

        mHeader.setListening(listening);

        mQSContainerImplController.setListening(listening);

        mFooter.setListening(listening);

    }

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

+32 −327

File changed.

Preview size limit exceeded, changes collapsed.

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

+371 −9
Original line number Diff line number Diff line
@@ -16,36 +16,393 @@ 


package com.android.systemui.qs;



import android.app.AlarmManager.AlarmClockInfo;

import android.content.Intent;

import android.media.AudioManager;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.provider.AlarmClock;

import android.provider.Settings;

import android.service.notification.ZenModeConfig;

import android.util.Log;

import android.view.View;

import android.view.View.OnClickListener;



import androidx.annotation.NonNull;

import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleOwner;

import androidx.lifecycle.LifecycleRegistry;



import com.android.internal.logging.UiEventLogger;

import com.android.systemui.R;

import com.android.systemui.demomode.DemoMode;

import com.android.systemui.demomode.DemoModeController;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.privacy.OngoingPrivacyChip;

import com.android.systemui.privacy.PrivacyChipEvent;

import com.android.systemui.privacy.PrivacyItem;

import com.android.systemui.privacy.PrivacyItemController;

import com.android.systemui.qs.carrier.QSCarrierGroupController;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.CommandQueue;

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

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

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

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

import com.android.systemui.statusbar.policy.NextAlarmController.NextAlarmChangeCallback;

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

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

import com.android.systemui.util.RingerModeTracker;

import com.android.systemui.util.ViewController;



import java.util.ArrayList;

import java.util.List;



import javax.inject.Inject;



public class QuickStatusBarHeaderController {

    private final QuickStatusBarHeader mView;

/**

 * Controller for {@link QuickStatusBarHeader}.

 */

class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader> {

    private static final String TAG = "QuickStatusBarHeader";



    private final ZenModeController mZenModeController;

    private final NextAlarmController mNextAlarmController;

    private final PrivacyItemController mPrivacyItemController;

    private final RingerModeTracker mRingerModeTracker;

    private final ActivityStarter mActivityStarter;

    private final UiEventLogger mUiEventLogger;

    private final QSCarrierGroupController mQSCarrierGroupController;

    private final QuickQSPanel mHeaderQsPanel;

    private final LifecycleRegistry mLifecycle;

    private final OngoingPrivacyChip mPrivacyChip;

    private final Clock mClockView;

    private final View mNextAlarmContainer;

    private final View mRingerContainer;

    private final QSTileHost mQSTileHost;

    private final StatusBarIconController mStatusBarIconController;

    private final CommandQueue mCommandQueue;

    private final DemoModeController mDemoModeController;

    private final UserTracker mUserTracker;

    private final StatusIconContainer mIconContainer;

    private final StatusBarIconController.TintedIconManager mIconManager;

    private final DemoMode mDemoModeReceiver;



    private boolean mListening;

    private AlarmClockInfo mNextAlarm;

    private boolean mAllIndicatorsEnabled;

    private boolean mMicCameraIndicatorsEnabled;

    private boolean mPrivacyChipLogged;

    private int mRingerMode = AudioManager.RINGER_MODE_NORMAL;



    private final ZenModeController.Callback mZenModeControllerCallback = new Callback() {

        @Override

        public void onZenChanged(int zen) {

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

                    use24HourFormat());

        }



        @Override

        public void onConfigChanged(ZenModeConfig config) {

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

                    use24HourFormat());

        }

    };



    private boolean use24HourFormat() {

        return android.text.format.DateFormat.is24HourFormat(

                mView.getContext(), mUserTracker.getUserId());



    }



    private final NextAlarmChangeCallback mNextAlarmChangeCallback = new NextAlarmChangeCallback() {

        @Override

        public void onNextAlarmChanged(AlarmClockInfo nextAlarm) {

            mNextAlarm = nextAlarm;

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

                    use24HourFormat());

        }

    };



    private final LifecycleOwner mLifecycleOwner = new LifecycleOwner() {

        @NonNull

        @Override

        public Lifecycle getLifecycle() {

            return mLifecycle;

        }

    };



    private PrivacyItemController.Callback mPICCallback = new PrivacyItemController.Callback() {

        @Override

        public void onPrivacyItemsChanged(@NonNull List<PrivacyItem> privacyItems) {

            mPrivacyChip.setPrivacyList(privacyItems);

            setChipVisibility(!privacyItems.isEmpty());

        }



        @Override

        public void onFlagAllChanged(boolean flag) {

            if (mAllIndicatorsEnabled != flag) {

                mAllIndicatorsEnabled = flag;

                update();

            }

        }



        @Override

        public void onFlagMicCameraChanged(boolean flag) {

            if (mMicCameraIndicatorsEnabled != flag) {

                mMicCameraIndicatorsEnabled = flag;

                update();

            }

        }



        private void update() {

            StatusIconContainer iconContainer = mView.requireViewById(R.id.statusIcons);

            iconContainer.setIgnoredSlots(getIgnoredIconSlots());

            setChipVisibility(!mPrivacyChip.getPrivacyList().isEmpty());

        }

    };



    private View.OnClickListener mOnClickListener = new OnClickListener() {

        @Override

        public void onClick(View v) {

            if (v == mClockView) {

                mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                        AlarmClock.ACTION_SHOW_ALARMS), 0);

            } else if (v == mNextAlarmContainer && mNextAlarmContainer.isVisibleToUser()) {

                if (mNextAlarm.getShowIntent() != null) {

                    mActivityStarter.postStartActivityDismissingKeyguard(

                            mNextAlarm.getShowIntent());

                } else {

                    Log.d(TAG, "No PendingIntent for next alarm. Using default intent");

                    mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                            AlarmClock.ACTION_SHOW_ALARMS), 0);

                }

            } else if (v == mPrivacyChip) {

                // If the privacy chip is visible, it means there were some indicators

                Handler mUiHandler = new Handler(Looper.getMainLooper());

                mUiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_CLICK);

                mUiHandler.post(() -> {

                    mActivityStarter.postStartActivityDismissingKeyguard(

                            new Intent(Intent.ACTION_REVIEW_ONGOING_PERMISSION_USAGE), 0);

                    mQSTileHost.collapsePanels();

                });

            } else if (v == mRingerContainer && mRingerContainer.isVisibleToUser()) {

                mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                        Settings.ACTION_SOUND_SETTINGS), 0);

            }

        }

    };



    private QuickStatusBarHeaderController(QuickStatusBarHeader view,

            ZenModeController zenModeController, NextAlarmController nextAlarmController,

            PrivacyItemController privacyItemController, RingerModeTracker ringerModeTracker,

            ActivityStarter activityStarter, UiEventLogger uiEventLogger,

            QSTileHost qsTileHost, StatusBarIconController statusBarIconController,

            CommandQueue commandQueue, DemoModeController demoModeController,

            UserTracker userTracker,

            QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder) {

        mView = view;

        super(view);

        mZenModeController = zenModeController;

        mNextAlarmController = nextAlarmController;

        mPrivacyItemController = privacyItemController;

        mRingerModeTracker = ringerModeTracker;

        mActivityStarter = activityStarter;

        mUiEventLogger = uiEventLogger;

        mQSTileHost = qsTileHost;

        mStatusBarIconController = statusBarIconController;

        mCommandQueue = commandQueue;

        mDemoModeController = demoModeController;

        mUserTracker = userTracker;

        mLifecycle = new LifecycleRegistry(mLifecycleOwner);



        mQSCarrierGroupController = qsCarrierGroupControllerBuilder

                .setQSCarrierGroup(mView.findViewById(R.id.carrier_group))

                .build();





        mPrivacyChip = mView.findViewById(R.id.privacy_chip);

        mHeaderQsPanel = mView.findViewById(R.id.quick_qs_panel);

        mNextAlarmContainer = mView.findViewById(R.id.alarm_container);

        mClockView = mView.findViewById(R.id.clock);

        mRingerContainer = mView.findViewById(R.id.ringer_container);

        mIconContainer = mView.findViewById(R.id.statusIcons);



        mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, mCommandQueue);

        mDemoModeReceiver = new ClockDemoModeReceiver(mClockView);

    }



    @Override

    protected void onViewAttached() {

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

            mRingerMode = ringer;

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

                    use24HourFormat());

        });



        mClockView.setOnClickListener(mOnClickListener);

        mNextAlarmContainer.setOnClickListener(mOnClickListener);

        mRingerContainer.setOnClickListener(mOnClickListener);

        mPrivacyChip.setOnClickListener(mOnClickListener);



        // Ignore privacy icons because they show in the space above QQS

        mIconContainer.addIgnoredSlots(getIgnoredIconSlots());

        mIconContainer.setShouldRestrictIcons(false);

        mStatusBarIconController.addIconGroup(mIconManager);



        mAllIndicatorsEnabled = mPrivacyItemController.getAllIndicatorsAvailable();

        mMicCameraIndicatorsEnabled = mPrivacyItemController.getMicCameraAvailable();



        setChipVisibility(mPrivacyChip.getVisibility() == View.VISIBLE);



        mView.onAttach(mIconManager);



        mDemoModeController.addCallback(mDemoModeReceiver);

    }



    @Override

    protected void onViewDetached() {

        mRingerModeTracker.getRingerModeInternal().removeObservers(mLifecycleOwner);

        mClockView.setOnClickListener(null);

        mNextAlarmContainer.setOnClickListener(null);

        mRingerContainer.setOnClickListener(null);

        mPrivacyChip.setOnClickListener(null);

        mStatusBarIconController.removeIconGroup(mIconManager);

        mDemoModeController.removeCallback(mDemoModeReceiver);

        setListening(false);

    }



    public void setListening(boolean listening) {

        mQSCarrierGroupController.setListening(listening);

        // TODO: move mView.setListening logic into here.

        mView.setListening(listening);



        if (listening == mListening) {

            return;

        }

        mListening = listening;



        mHeaderQsPanel.setListening(listening);

        if (mHeaderQsPanel.switchTileLayout()) {

            mView.updateResources();

        }



        if (listening) {

            mZenModeController.addCallback(mZenModeControllerCallback);

            mNextAlarmController.addCallback(mNextAlarmChangeCallback);

            mLifecycle.setCurrentState(Lifecycle.State.RESUMED);

            // Get the most up to date info

            mAllIndicatorsEnabled = mPrivacyItemController.getAllIndicatorsAvailable();

            mMicCameraIndicatorsEnabled = mPrivacyItemController.getMicCameraAvailable();

            mPrivacyItemController.addCallback(mPICCallback);

        } else {

            mZenModeController.removeCallback(mZenModeControllerCallback);

            mNextAlarmController.removeCallback(mNextAlarmChangeCallback);

            mLifecycle.setCurrentState(Lifecycle.State.CREATED);

            mPrivacyItemController.removeCallback(mPICCallback);

            mPrivacyChipLogged = false;

        }

    }



    private void setChipVisibility(boolean chipVisible) {

        if (chipVisible && getChipEnabled()) {

            mPrivacyChip.setVisibility(View.VISIBLE);

            // Makes sure that the chip is logged as viewed at most once each time QS is opened

            // mListening makes sure that the callback didn't return after the user closed QS

            if (!mPrivacyChipLogged && mListening) {

                mPrivacyChipLogged = true;

                mUiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_VIEW);

            }

        } else {

            mPrivacyChip.setVisibility(View.GONE);

        }

    }



    private List<String> getIgnoredIconSlots() {

        ArrayList<String> ignored = new ArrayList<>();

        if (getChipEnabled()) {

            ignored.add(mView.getResources().getString(

                    com.android.internal.R.string.status_bar_camera));

            ignored.add(mView.getResources().getString(

                    com.android.internal.R.string.status_bar_microphone));

            if (mAllIndicatorsEnabled) {

                ignored.add(mView.getResources().getString(

                        com.android.internal.R.string.status_bar_location));

            }

        }



        return ignored;

    }



    public static class Builder {

    private boolean getChipEnabled() {

        return mMicCameraIndicatorsEnabled || mAllIndicatorsEnabled;

    }



    private boolean isZenOverridingRinger() {

        return ZenModeConfig.isZenOverridingRinger(mZenModeController.getZen(),

                mZenModeController.getConsolidatedPolicy());

    }





    private static class ClockDemoModeReceiver implements DemoMode {

        private Clock mClockView;



        @Override

        public List<String> demoCommands() {

            return List.of(COMMAND_CLOCK);

        }



        ClockDemoModeReceiver(Clock clockView) {

            mClockView = clockView;

        }



        @Override

        public void dispatchDemoCommand(String command, Bundle args) {

            mClockView.dispatchDemoCommand(command, args);

        }



        @Override

        public void onDemoModeStarted() {

            mClockView.onDemoModeStarted();

        }



        @Override

        public void onDemoModeFinished() {

            mClockView.onDemoModeFinished();

        }

    }



    static class Builder {

        private final ZenModeController mZenModeController;

        private final NextAlarmController mNextAlarmController;

        private final PrivacyItemController mPrivacyItemController;

        private final RingerModeTracker mRingerModeTracker;

        private final ActivityStarter mActivityStarter;

        private final UiEventLogger mUiEventLogger;

        private final QSTileHost mQsTileHost;

        private final StatusBarIconController mStatusBarIconController;

        private final CommandQueue mCommandQueue;

        private final DemoModeController mDemoModeController;

        private final UserTracker mUserTracker;

        private final QSCarrierGroupController.Builder mQSCarrierGroupControllerBuilder;

        private QuickStatusBarHeader mView;



        @Inject

        public Builder(QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder) {

        Builder(ZenModeController zenModeController, NextAlarmController nextAlarmController,

                PrivacyItemController privacyItemController, RingerModeTracker ringerModeTracker,

                ActivityStarter activityStarter, UiEventLogger uiEventLogger, QSTileHost qsTileHost,

                StatusBarIconController statusBarIconController, CommandQueue commandQueue,

                DemoModeController demoModeController, UserTracker userTracker,

                QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder) {

            mZenModeController = zenModeController;

            mNextAlarmController = nextAlarmController;

            mPrivacyItemController = privacyItemController;

            mRingerModeTracker = ringerModeTracker;

            mActivityStarter = activityStarter;

            mUiEventLogger = uiEventLogger;

            mQsTileHost = qsTileHost;

            mStatusBarIconController = statusBarIconController;

            mCommandQueue = commandQueue;

            mDemoModeController = demoModeController;

            mUserTracker = userTracker;

            mQSCarrierGroupControllerBuilder = qsCarrierGroupControllerBuilder;

        }
@@ -54,8 +411,13 @@ public class QuickStatusBarHeaderController { 
            return this;

        }



        public QuickStatusBarHeaderController build() {

            return new QuickStatusBarHeaderController(mView, mQSCarrierGroupControllerBuilder);



        QuickStatusBarHeaderController build() {

            return new QuickStatusBarHeaderController(mView, mZenModeController,

                    mNextAlarmController, mPrivacyItemController, mRingerModeTracker,

                    mActivityStarter, mUiEventLogger, mQsTileHost, mStatusBarIconController,

                    mCommandQueue, mDemoModeController, mUserTracker,

                    mQSCarrierGroupControllerBuilder);

        }

    }

}

packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.qs.QSFooterImpl;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QuickQSPanel;

import com.android.systemui.qs.QuickStatusBarHeader;

import com.android.systemui.qs.customize.QSCustomizer;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
@@ -92,10 +91,6 @@ public class InjectionInflationController { 
                    @BindsInstance AttributeSet attributeSet);

        }



        /**

         * Creates the QuickStatusBarHeader.

         */

        QuickStatusBarHeader createQsHeader();

        /**

         * Creates the QSFooterImpl.

         */