Merge "String changes in UI for enabling roaming data."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c47db4f..3a7961a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -442,7 +442,9 @@
"data roaming" feature turned off. -->
<string name="roaming_reenable_message">You\'ve lost data connectivity because you left your home network with data roaming turned off.</string>
<!-- Mobile network settings screen, dialog message when user selects the Data roaming check box -->
- <string name="roaming_warning">Allow data usage when roaming? Significant charges may apply.</string>
+ <string name="roaming_warning">You may incur significant charges.</string>
+ <!-- Mobile network settings screen, dialog message title when user selects the Data roaming check box -->
+ <string name="roaming_alert_title">Allow data roaming?</string>
<!-- USSD aggregation dialog box: separator strings between messages (new-lines will be added before and after) -->
<string name="ussd_dialog_sep" translatable="false">----------</string>
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 3e43ba1..b28a5f9 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -855,7 +855,7 @@
mOkClicked = false;
new AlertDialog.Builder(this).setMessage(
getResources().getString(R.string.roaming_warning))
- .setTitle(android.R.string.dialog_alert_title)
+ .setTitle(R.string.roaming_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)