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

Commit 76869152 authored by Andy Chou's avatar Andy Chou Committed by android-build-merger
Browse files

Merge "UE showed wrong title and message when enabling data roaming." into qt-dev 

am: a9e8c507

Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
parents 2082b0e9 a9e8c507

src/com/android/settings/network/telephony/RoamingDialogFragment.java

+3 −2
Original line number Diff line number Diff line
@@ -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)