commit 7d69db079e6fd9c22c71b05b14b64e004199627b
author pkanwar <pkanwar@google.com> Mon Jan 01 17:03:42 2018 -0800
committer pkanwar <pkanwar@google.com> Sun Jan 07 18:44:41 2018 -0800
tree 5a7e223327a828bd500a2449e3fdb29b8bad3721
parent d5129a22bb87092f1682056df3ce855d89e5b7a1

Change warning message for roaming for DTAG.

Bug: 64106612
Test: manual
Change-Id: Ia94a4097330b6b1c4de7e94ddfa9685328241af5

src/com/android/phone/RoamingDialogFragment.java

diff --git a/src/com/android/phone/RoamingDialogFragment.java b/src/com/android/phone/RoamingDialogFragment.java
index 21c6946..4d3bd47 100644
--- a/src/com/android/phone/RoamingDialogFragment.java
+++ b/src/com/android/phone/RoamingDialogFragment.java
@@ -24,6 +24,10 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+
+import com.android.internal.telephony.Phone;
 
 /**
  * A dialog fragment that asks the user if they are sure they want to turn on data roaming
@@ -41,6 +45,11 @@
     // the host activity which implements the listening interface
     private RoamingDialogListener mListener;
 
+    private Phone mPhone;
+
+    public void setPhone(Phone phone) {
+        mPhone = phone;
+    }
 
     @Override
     public void onAttach(Context context) {
@@ -59,8 +68,17 @@
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        int title = R.string.roaming_alert_title;
+        if (mPhone != null) {
+            PersistableBundle carrierConfig =
+                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+            if (carrierConfig != null && carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
+                title = R.string.roaming_check_price_warning;
+            }
+        }
         builder.setMessage(getResources().getString(R.string.roaming_warning))
-                .setTitle(R.string.roaming_alert_title)
+                .setTitle(title)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, this)
                 .setNegativeButton(android.R.string.no, this);