Merge "Add Data warning and limit footer text." into pi-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75d4471..e4e311d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8709,6 +8709,9 @@
<!-- Label for button to set the amount of data before user is warned about usage [CHAR LIMIT=30] -->
<string name="data_warning">Data warning</string>
+ <!-- Label for footnote on Data warning and limit page to warn of device discrepancies -->
+ <string name="data_warning_footnote">Data warning and data limit are measured by your device. This may be different from carrier data.</string>
+
<!-- Label for switch about whether to limit how much data can be used [CHAR LIMIT=30] -->
<string name="set_data_limit">Set data limit</string>
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 34d18e9..8cec3e7 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -91,6 +91,8 @@
mEnableDataLimit = (SwitchPreference) findPreference(KEY_SET_DATA_LIMIT);
mEnableDataLimit.setOnPreferenceChangeListener(this);
mDataLimit = findPreference(KEY_DATA_LIMIT);
+
+ mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.data_warning_footnote);
}
@Override