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

Commit 2c2f6b80 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Only show mobile data turn off dialog once." into pi-dev am:... 

Merge "Merge "Only show mobile data turn off dialog once." into pi-dev am: cb878721" into pi-dev-plus-aosp
parents 00c470bf 7bb72d63

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

+8 −7
Original line number Diff line number Diff line
@@ -108,20 +108,21 @@ public class CellularTile extends QSTileImpl<SignalState> { 
        }

        if (mDataController.isMobileDataEnabled()) {

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

                mActivityStarter.postQSRunnableDismissingKeyguard(this::showDisableDialog);

                mActivityStarter.postQSRunnableDismissingKeyguard(this::maybeShowDisableDialog);

            } else {

                if (Prefs.getBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, false)) {

                    mDataController.setMobileDataEnabled(false);

                } else {

                    mUiHandler.post(this::showDisableDialog);

                }

                mUiHandler.post(this::maybeShowDisableDialog);

            }

        } else {

            mDataController.setMobileDataEnabled(true);

        }

    }



    private void showDisableDialog() {

    private void maybeShowDisableDialog() {

        if (Prefs.getBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, false)) {

            // Directly turn off mobile data if the user has seen the dialog before.

            mDataController.setMobileDataEnabled(false);

            return;

        }

        mHost.collapsePanels();

        String carrierName = mController.getMobileDataNetworkName();

        if (TextUtils.isEmpty(carrierName)) {