PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-29 13:13:04 +00:00
committed by Android (Google) Code Review
parent 80fd8a7cce d2fb4f06a3
commit a375349c0a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -212,6 +212,8 @@ public class ProviderModelSlice extends WifiSlice {
R.string.mobile_data_disable_message_default_carrier); R.string.mobile_data_disable_message_default_carrier);
} }
showMobileDataDisableDialog(getMobileDataDisableDialog(defaultSubId, carrierName)); showMobileDataDisableDialog(getMobileDataDisableDialog(defaultSubId, carrierName));
// If we need to display a reminder dialog box, do nothing here.
return;
} else { } else {
MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, newState, MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, newState,
false /* disableOtherSubscriptions */); false /* disableOtherSubscriptions */);
@@ -229,13 +231,24 @@ public class ProviderModelSlice extends WifiSlice {
.setTitle(R.string.mobile_data_disable_title) .setTitle(R.string.mobile_data_disable_title)
.setMessage(mContext.getString(R.string.mobile_data_disable_message, .setMessage(mContext.getString(R.string.mobile_data_disable_message,
carrierName)) carrierName))
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel,
(dialog, which) -> {
// Because the toggle of mobile data will be turned off first, if the
// user cancels the operation, we need to update the slice to correct
// the toggle state.
final NetworkProviderWorker worker = getWorker();
if (worker != null) {
worker.updateSlice();
}
})
.setPositiveButton( .setPositiveButton(
com.android.internal.R.string.alert_windows_notification_turn_off_action, com.android.internal.R.string.alert_windows_notification_turn_off_action,
(dialog, which) -> { (dialog, which) -> {
MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId,
false /* enabled */, false /* enabled */,
false /* disableOtherSubscriptions */); false /* disableOtherSubscriptions */);
doCarrierNetworkAction(true /* isToggleAction */,
false /* isDataEanbed */, defaultSubId);
if (mSharedPref != null) { if (mSharedPref != null) {
SharedPreferences.Editor editor = mSharedPref.edit(); SharedPreferences.Editor editor = mSharedPref.edit();
editor.putBoolean(PREF_HAS_TURNED_OFF_MOBILE_DATA, false); editor.putBoolean(PREF_HAS_TURNED_OFF_MOBILE_DATA, false);