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

Commit 88a1fe5e authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Mobile data can be turned off from keyguard 

The dialog for the first time the user turns it off will also show on
top of the keyguard.

Test: manual
Fixes: 113768114
Change-Id: I8ba1715227f634887cb6de68e5660df4d46064ea
parent 6f59ef8a

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+2 −9
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.systemui.qs.CellTileView; 
import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.tileimpl.QSTileImpl;

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

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

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

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

import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
@@ -66,15 +65,13 @@ public class CellularTile extends QSTileImpl<SignalState> { 


    private final CellSignalCallback mSignalCallback = new CellSignalCallback();

    private final ActivityStarter mActivityStarter;

    private final KeyguardMonitor mKeyguardMonitor;



    @Inject

    public CellularTile(QSHost host, NetworkController networkController,

            ActivityStarter activityStarter, KeyguardMonitor keyguardMonitor) {

            ActivityStarter activityStarter) {

        super(host);

        mController = networkController;

        mActivityStarter = activityStarter;

        mKeyguardMonitor = keyguardMonitor;

        mDataController = mController.getMobileDataController();

        mDetailAdapter = new CellularDetailAdapter();

        mController.observe(getLifecycle(), mSignalCallback);
@@ -110,11 +107,7 @@ public class CellularTile extends QSTileImpl<SignalState> { 
            return;

        }

        if (mDataController.isMobileDataEnabled()) {

            if (mKeyguardMonitor.isSecure() && !mKeyguardMonitor.canSkipBouncer()) {

                mActivityStarter.postQSRunnableDismissingKeyguard(this::maybeShowDisableDialog);

            } else {

                mUiHandler.post(this::maybeShowDisableDialog);

            }

            maybeShowDisableDialog();

        } else {

            mDataController.setMobileDataEnabled(true);

        }