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

Browse Source 
am: a9e8c50764

Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
This commit is contained in:
Andy Chou
2019-06-05 19:51:46 -07:00
committed by android-build-merger
parent 2082b0e969 a9e8c50764
commit 768691520b
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) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
int title = R.string.roaming_alert_title;
int message = R.string.roaming_warning;
PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
if (carrierConfig != null && carrierConfig.getBoolean(
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)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this)