diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-04-15 12:54:23 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2016-04-15 15:36:04 -0700 |
| commit | 5849b8ac9c52c7c4ceb718c4d4a5f90f6c4ef956 (patch) | |
| tree | 24f8625f56508fa9106a5297cef5f64ccc8d0f66 /res | |
| parent | 43130012ca0a453b15837c1937e6e5165779c164 (diff) | |
| download | android_packages_apps_Messaging-5849b8ac9c52c7c4ceb718c4d4a5f90f6c4ef956.tar.gz android_packages_apps_Messaging-5849b8ac9c52c7c4ceb718c4d4a5f90f6c4ef956.tar.bz2 android_packages_apps_Messaging-5849b8ac9c52c7c4ceb718c4d4a5f90f6c4ef956.zip | |
Messaging: Fix broken and untested features.
Since the features for validity, delivery, read
report and sending report are all per subscription,
they need to abide by the runtime sanity checks provided
by the BuglePrefs implementation which asserts that any
such preferences will hava key that is prefixed with
"buglesub_"
Change-Id: Iba026257c6514e4ab4e9640d1615d4da4a0cfd62
TICKET: PAELLA-187,PAELLA-188,PAELLA-189
(cherry picked from commit d9a5a8360c11e79c14904035f63b6c469e07838b)
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/cm_constants.xml | 10 | ||||
| -rw-r--r-- | res/values/constants.xml | 9 |
3 files changed, 11 insertions, 10 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 81e36e0..65e265b 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -63,7 +63,7 @@ <item>604800</item> </string-array> - <string-array name="priority_send_values" > + <string-array name="priority_send_values" translatable="false" > <item>128</item> <!-- PRIORITY_LOW --> <item>129</item> <!--PRIORITY_NORMAL --> <item>130</item> <!-- PRIORITY_HIGH --> diff --git a/res/values/cm_constants.xml b/res/values/cm_constants.xml index 5dcac5d..93fb461 100644 --- a/res/values/cm_constants.xml +++ b/res/values/cm_constants.xml @@ -26,4 +26,14 @@ <!-- Preference keys for user-visible settings --> <!-- Application-wide settings --> <bool name="show_emoticons_pref_default" translatable="false">true</bool> + + <!-- Subscription-specific settings. The values of these pref keys must be prefixed with + "buglesub_" to allow for runtime sanity checks --> + <string name="expiry_mms_pref_key" translatable="false">buglesub_expiry_mms_pref_key</string> + <string name="expiry_slot1_mms_pref_key" translatable="false">buglesub_expiry_slot1_mms_pref_key</string> + <string name="expiry_slot2_mms_pref_key" translatable="false">buglesub_expiry_slot2_mms_pref_key</string> + <string name="delivery_reports_mms_pref_key" translatable="false">buglesub_delivery_reports_mms_pref_key</string> + <bool name="def_mms_delivery_reports">false</bool> + <string name="read_reports_mms_pref_key" translatable="false">buglesub_read_reports_mms_pref_key</string> + <string name="priority_mms_pref_key" translatable="false">buglesub_priority_mms_pref_key</string> </resources> diff --git a/res/values/constants.xml b/res/values/constants.xml index 1749be7..52c39ac 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -26,12 +26,6 @@ <string name="pref_key_sms_validity_period" translatable="false">pref_key_sms_validity_period</string> <string name="pref_key_sms_validity_period_slot1" translatable="false">pref_key_sms_validity_period_slot1</string> <string name="pref_key_sms_validity_period_slot2" translatable="false">pref_key_sms_validity_period_slot2</string> - <string name="expiry_mms_pref_key" translatable="false">expiry_mms_pref_key</string> - <string name="expiry_slot1_mms_pref_key" translatable="false">expiry_slot1_mms_pref_key</string> - <string name="expiry_slot2_mms_pref_key" translatable="false">expiry_slot2_mms_pref_key</string> - <string name="delivery_reports_mms_pref_key" translatable="false">delivery_reports_mms_pref_key</string> - <string name="read_reports_mms_pref_key" translatable="false">read_reports_mms_pref_key</string> - <string name="priority_mms_pref_key" translatable="false">priority_mms_pref_key</string> <bool name="notifications_enabled_pref_default" translatable="false">true</bool> <string name="notification_sound_pref_key" translatable="false">notification_sound</string> <string name="notification_vibration_pref_key" translatable="false">notification_vibration</string> @@ -50,9 +44,6 @@ <!-- default sms validity period --> <string name="def_sms_validity_period_value" translatable="false">-1</string> - <!-- mms delivery reports enabled.default is true to on,false to off --> - <bool name="def_mms_delivery_reports">false</bool> - <!-- Subscription-specific settings. The values of these pref keys must be prefixed with "buglesub_" to allow for runtime sanity checks --> <string name="delivery_reports_pref_key" translatable="false">buglesub_delivery_reports</string> |