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

Commit 6b2a11aa authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix mobile data toggle status not correct" into udc-qpr-dev am: 6dcdddc3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23368302



Change-Id: I1ebf0e35e976d67e1aaa6abf558942a23a86be41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b7f809e 6dcdddc3

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+11 −17
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ public class InternetDialog extends SystemUIDialog implements 
        mHandler.removeCallbacks(mHideProgressBarRunnable);

        mHandler.removeCallbacks(mHideSearchingRunnable);

        mMobileNetworkLayout.setOnClickListener(null);

        mMobileDataToggle.setOnCheckedChangeListener(null);

        mConnectedWifListLayout.setOnClickListener(null);

        if (mSecondaryMobileNetworkLayout != null) {

            mSecondaryMobileNetworkLayout.setOnClickListener(null);
@@ -351,14 +350,12 @@ public class InternetDialog extends SystemUIDialog implements 
            }

            mInternetDialogController.connectCarrierNetwork();

        });

        mMobileDataToggle.setOnCheckedChangeListener(

                (buttonView, isChecked) -> {

        mMobileDataToggle.setOnClickListener(v -> {

            boolean isChecked = mMobileDataToggle.isChecked();

            if (!isChecked && shouldShowMobileDialog()) {

                mMobileDataToggle.setChecked(true);

                showTurnOffMobileDialog();

                    } else if (!shouldShowMobileDialog()) {

                        if (mInternetDialogController.isMobileDataEnabled() == isChecked) {

                            return;

                        }

            } else if (mInternetDialogController.isMobileDataEnabled() != isChecked) {

                mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId,

                        isChecked, false);

            }
@@ -696,9 +693,7 @@ public class InternetDialog extends SystemUIDialog implements 
        mAlertDialog = new Builder(mContext)

                .setTitle(R.string.mobile_data_disable_title)

                .setMessage(mContext.getString(R.string.mobile_data_disable_message, carrierName))

                .setNegativeButton(android.R.string.cancel, (d, w) -> {

                    mMobileDataToggle.setChecked(true);

                })

                .setNegativeButton(android.R.string.cancel, (d, w) -> {})

                .setPositiveButton(

                        com.android.internal.R.string.alert_windows_notification_turn_off_action,

                        (d, w) -> {
@@ -708,7 +703,6 @@ public class InternetDialog extends SystemUIDialog implements 
                            Prefs.putBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, true);

                        })

                .create();

        mAlertDialog.setOnCancelListener(dialog -> mMobileDataToggle.setChecked(true));

        mAlertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

        SystemUIDialog.setShowForAllUsers(mAlertDialog, true);

        SystemUIDialog.registerDismissListener(mAlertDialog);