diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 380b85cb5504..212a2b732e0d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -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,18 +350,16 @@ public class InternetDialog extends SystemUIDialog implements } mInternetDialogController.connectCarrierNetwork(); }); - mMobileDataToggle.setOnCheckedChangeListener( - (buttonView, isChecked) -> { - if (!isChecked && shouldShowMobileDialog()) { - showTurnOffMobileDialog(); - } else if (!shouldShowMobileDialog()) { - if (mInternetDialogController.isMobileDataEnabled() == isChecked) { - return; - } - mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId, - isChecked, false); - } - }); + mMobileDataToggle.setOnClickListener(v -> { + boolean isChecked = mMobileDataToggle.isChecked(); + if (!isChecked && shouldShowMobileDialog()) { + mMobileDataToggle.setChecked(true); + showTurnOffMobileDialog(); + } else if (mInternetDialogController.isMobileDataEnabled() != isChecked) { + mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId, + isChecked, false); + } + }); mConnectedWifListLayout.setOnClickListener(this::onClickConnectedWifi); mSeeAllLayout.setOnClickListener(this::onClickSeeMoreButton); mWiFiToggle.setOnCheckedChangeListener( @@ -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); |