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

Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764 am: 8c0d669d6e

Browse Source 
am: 3d43db4e50

Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
This commit is contained in:
Andy Chou
2019-06-05 20:46:46 -07:00
committed by android-build-merger
parent ed8e6fab8d 3d43db4e50
commit d8ff88aa81
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/RoamingDialogFragment.java
View File

@@ -61,12 +61,13 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
int title = R.string.roaming_alert_title; int title = R.string.roaming_alert_title;
int message = R.string.roaming_warning;
PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
if (carrierConfig != null && carrierConfig.getBoolean( if (carrierConfig != null && carrierConfig.getBoolean(
CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) { CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
title = R.string.roaming_check_price_warning; message = R.string.roaming_check_price_warning;
} }
builder.setMessage(getResources().getString(R.string.roaming_warning)) builder.setMessage(getResources().getString(message))
.setTitle(title) .setTitle(title)
.setIconAttribute(android.R.attr.alertDialogIcon) .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this) .setPositiveButton(android.R.string.yes, this)