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

2 files changed, 52 insertions, 7 deletions

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"