Added new feature MMS Validity Period, MMS Delivery,Read Report and MMS

Sending Report

New preference field for mms are added in Messaging advanced settings
ported from CyanogenMod 12.0 Messaging application to CyanogenMod 13.0.
New preference field for MMS Send Priority are added in Messaging advanced
settings and changed Naming Conventions and chmod changed to 644

Bug: PAELLA-187,PAELLA-188,PAELLA-189
Change-Id: I7d9461bb1f967003733c669cf08edc480c2cc5c5

8 files changed, 157 insertions, 22 deletions

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 26cf8a5..81e36e0 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -44,4 +44,29 @@
         <item>1440</item>
         <item>635040</item>
     </string-array>
+
+    <string-array name="save_time" translatable="false">
+        <item>@string/validity_period_maximum</item>
+        <item>@string/mms_validity_period_two_days</item>
+        <item>@string/mms_validity_period_one_week</item>
+    </string-array>
+
+    <string-array name="priority_send" translatable="false">
+        <item>@string/priority_low</item>
+        <item>@string/priority_normal</item>
+        <item>@string/priority_high</item>
+    </string-array>
+
+    <string-array name="save_time_values" translatable="false">
+        <item>-1</item>  <!-- maximum -->
+        <item>172800</item>   <!--2*24*60*60 -->
+        <item>604800</item>
+    </string-array>
+
+    <string-array name="priority_send_values" >
+        <item>128</item>    <!-- PRIORITY_LOW  -->
+        <item>129</item>    <!--PRIORITY_NORMAL -->
+        <item>130</item>    <!-- PRIORITY_HIGH  -->
+    </string-array>
+
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0a3b2bc..cff2c89 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -24,15 +24,27 @@
     <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
 
     <!-- Settings item description for SMS and MMS Validity period -->
-    <string name="pref_title_validity_period">Validity period</string>
-    <string name="pref_title_validity_period_slot1">Validity period for SIM 1</string>
-    <string name="pref_title_validity_period_slot2">Validity period for SIM 2</string>
+    <string name="validity_period_pref_title">Validity period</string>
+    <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
     <string name="sms_validity_period_not_set">Not set</string>
     <string name="sms_validity_period_one_hour">1 hour</string>
     <string name="sms_validity_period_six_hours">6 hours</string>
     <string name="sms_validity_period_twelve_hours">12 hours</string>
     <string name="sms_validity_period_one_day">1 day</string>
+    <string name="mms_validity_period_two_days">2 days</string>
+    <string name="mms_validity_period_one_week">1 week</string>
     <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
+    <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
+    <string name="delivery_reports_mms_pref_title">Delivery reports</string>
+    <string name="read_reports_mms_pref_title">Read reports</string>
+
+    <!-- Item Descriptions for MMS sending Priority -->
+    <string name="priority_pref_title">Send Priority</string>
+    <string name="priority_low">Low</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">High</string>
 
     <!-- Swipe to delete conversation -->
     <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 52c39ac..1749be7 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -26,6 +26,12 @@
     <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>
@@ -44,6 +50,9 @@
     <!-- 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>
diff --git a/res/xml-v21/preferences_application.xml b/res/xml-v21/preferences_application.xml
index 0b07321..533e692 100644
--- a/res/xml-v21/preferences_application.xml
+++ b/res/xml-v21/preferences_application.xml
@@ -77,33 +77,33 @@
 
     <ListPreference
         android:key="pref_key_sms_validity_period"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period" />
+        android:title="@string/validity_period_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot1"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot1" />
+        android:title="@string/validity_period_slot1_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot2"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot2" />
+        android:title="@string/validity_period_slot2_pref_title" />
 
 
     <SwitchPreference
diff --git a/res/xml-v21/preferences_per_subscription.xml b/res/xml-v21/preferences_per_subscription.xml
index d0ae3e6..d5e6c64 100644
--- a/res/xml-v21/preferences_per_subscription.xml
+++ b/res/xml-v21/preferences_per_subscription.xml
@@ -30,6 +30,18 @@
             android:title="@string/mms_phone_number_pref_title" />
 
         <SwitchPreference
+            android:key="delivery_reports_mms_pref_key"
+            android:title="@string/delivery_reports_mms_pref_title"
+            android:summary="@string/pref_summary_mms_delivery_reports"
+            android:defaultValue="@bool/def_mms_delivery_reports" />
+
+        <SwitchPreference
+            android:key="read_reports_mms_pref_key"
+            android:title="@string/read_reports_mms_pref_title"
+            android:summary="@string/pref_summary_mms_read_reports"
+            android:defaultValue="false" />
+
+        <SwitchPreference
             android:key="@string/auto_retrieve_mms_pref_key"
             android:title="@string/auto_retrieve_mms_pref_title"
             android:summary="@string/auto_retrieve_mms_pref_summary"
@@ -42,6 +54,38 @@
             android:summary="@string/auto_retrieve_mms_when_roaming_pref_summary"
             android:defaultValue="@bool/auto_retrieve_mms_when_roaming_pref_default" />
 
+        <ListPreference android:key="expiry_mms_pref_key"
+            android:title="@string/validity_period_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="expiry_slot1_mms_pref_key"
+            android:title="@string/validity_period_slot1_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="expiry_slot2_mms_pref_key"
+            android:title="@string/validity_period_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="priority_mms_pref_key"
+            android:title="@string/priority_pref_title"
+            android:dialogTitle="@string/priority_pref_title"
+            android:summary="%s"
+            android:entries="@array/priority_send"
+            android:entryValues="@array/priority_send_values"
+            android:defaultValue="129" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml-v23/preferences_application.xml b/res/xml-v23/preferences_application.xml
index f79e4a0..29a5a91 100644
--- a/res/xml-v23/preferences_application.xml
+++ b/res/xml-v23/preferences_application.xml
@@ -78,33 +78,33 @@
 
     <ListPreference
         android:key="pref_key_sms_validity_period"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period" />
+        android:title="@string/validity_period_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot1"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot1" />
+        android:title="@string/validity_period_slot1_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot2"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot2" />
+        android:title="@string/validity_period_slot2_pref_title" />
 
 
     <SwitchPreference
diff --git a/res/xml/preferences_application.xml b/res/xml/preferences_application.xml
index 9f5a87a..0e8aa45 100644
--- a/res/xml/preferences_application.xml
+++ b/res/xml/preferences_application.xml
@@ -77,33 +77,33 @@
 
     <ListPreference
         android:key="pref_key_sms_validity_period"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period" />
+        android:title="@string/validity_period_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot1"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot1" />
+        android:title="@string/validity_period_slot1_pref_title" />
 
     <ListPreference
         android:key="pref_key_sms_validity_period_slot2"
-        android:dialogTitle="@string/pref_title_validity_period"
+        android:dialogTitle="@string/validity_period_pref_title"
         android:persistent="true"
         android:defaultValue="@string/def_sms_validity_period_value"
         android:summary="%s"
         android:entries="@array/entries_sms_validity_period"
         android:entryValues="@array/entries_sms_validity_period_value"
-        android:title="@string/pref_title_validity_period_slot2" />
+        android:title="@string/validity_period_slot2_pref_title" />
 
     <CheckBoxPreference
         android:key="pref_show_emoticons"
diff --git a/res/xml/preferences_per_subscription.xml b/res/xml/preferences_per_subscription.xml
index 5e00086..03eb170 100644
--- a/res/xml/preferences_per_subscription.xml
+++ b/res/xml/preferences_per_subscription.xml
@@ -30,6 +30,18 @@
             android:title="@string/mms_phone_number_pref_title" />
 
         <CheckBoxPreference
+            android:key="delivery_reports_mms_pref_key"
+            android:title="@string/delivery_reports_mms_pref_title"
+            android:summary="@string/pref_summary_mms_delivery_reports"
+            android:defaultValue="@bool/def_mms_delivery_reports" />
+
+        <CheckBoxPreference
+            android:key="read_reports_mms_pref_key"
+            android:title="@string/read_reports_mms_pref_title"
+            android:summary="@string/pref_summary_mms_read_reports"
+            android:defaultValue="false" />
+
+        <CheckBoxPreference
             android:key="@string/auto_retrieve_mms_pref_key"
             android:title="@string/auto_retrieve_mms_pref_title"
             android:summary="@string/auto_retrieve_mms_pref_summary"
@@ -42,7 +54,40 @@
             android:summary="@string/auto_retrieve_mms_when_roaming_pref_summary"
             android:defaultValue="@bool/auto_retrieve_mms_when_roaming_pref_default" />
 
-    </PreferenceCategory>
+
+        <ListPreference android:key="expiry_mms_pref_key"
+            android:title="@string/validity_period_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="expiry_slot1_mms_pref_key"
+            android:title="@string/validity_period_slot1_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="expiry_slot2_mms_pref_key"
+            android:title="@string/validity_period_slot2_pref_title"
+            android:dialogTitle="@string/validity_period_pref_title"
+            android:summary="%s"
+            android:entries="@array/save_time"
+            android:entryValues="@array/save_time_values"
+            android:defaultValue="0" />
+
+        <ListPreference android:key="priority_mms_pref_key"
+            android:title="@string/priority_pref_title"
+            android:dialogTitle="@string/priority_pref_title"
+            android:summary="%s"
+            android:entries="@array/priority_send"
+            android:entryValues="@array/priority_send_values"
+            android:defaultValue="129" />
+
+     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="@string/advanced_category_pref_key"