Merge "Follow framework refactoring." into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c879d22..7c701b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -459,8 +459,9 @@
android:label="@string/delete_fdn_contact">
</activity>
- <activity android:name="DataRoamingReenable" android:label="@string/android:dialog_alert_title"
- android:theme="@android:style/Theme.Holo.Dialog">
+ <activity android:name="DataRoamingReenable"
+ android:label="@string/dialog_alert_title"
+ android:theme="@android:style/Theme.Holo.Dialog">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49bc518..d231620 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -435,6 +435,8 @@
<string name="data_enabled">Data enabled</string>
<!-- Mobile network settings screen, setting summary text when check box is not selected (explains what selecting it would do) [CHAR LIMITS=40] -->
<string name="data_enable_summary">Allow data usage</string>
+ <!-- Mobile network settings screen, title for alert dialog -->
+ <string name="dialog_alert_title">Attention</string>
<!-- Mobile network settings screen, setting check box name -->
<string name="roaming">Data roaming</string>
<!-- Mobile network settings screen, setting summary text when check box is selected -->