Messaging: Fix mms expiry preferences.

  MmsUtils utilizes BuglePrefs#getSubscriptionPrefs
  to retrieve shared preferences specific to a subscription
  id (this is visible in the FactoryImpl of Messaging). Thus,
  its entirely wrong to have multiple options, per slot, per
  subscription id.

TICKET: CYNGNOS-2520
Change-Id: I33e49160ed64ebf38f55022bc1f5293704815399

4 files changed, 0 insertions, 35 deletions

diff --git a/res/values/cm_constants.xml b/res/values/cm_constants.xml
index 93fb461..18d0104 100644
--- a/res/values/cm_constants.xml
+++ b/res/values/cm_constants.xml
@@ -30,8 +30,6 @@
     <!-- 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>
diff --git a/res/xml-v21/preferences_application.xml b/res/xml-v21/preferences_application.xml
index 533e692..8acbae1 100644
--- a/res/xml-v21/preferences_application.xml
+++ b/res/xml-v21/preferences_application.xml
@@ -105,7 +105,6 @@
         android:entryValues="@array/entries_sms_validity_period_value"
         android:title="@string/validity_period_slot2_pref_title" />
 
-
     <SwitchPreference
         android:key="pref_show_emoticons"
         android:title="@string/show_emoticons_pref_title"
diff --git a/res/xml-v21/preferences_per_subscription.xml b/res/xml-v21/preferences_per_subscription.xml
index 5e0513f..6625233 100644
--- a/res/xml-v21/preferences_per_subscription.xml
+++ b/res/xml-v21/preferences_per_subscription.xml
@@ -62,22 +62,6 @@
             android:entryValues="@array/save_time_values"
             android:defaultValue="0" />
 
-        <ListPreference android:key="@string/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="@string/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="@string/priority_mms_pref_key"
             android:title="@string/priority_pref_title"
             android:dialogTitle="@string/priority_pref_title"
diff --git a/res/xml/preferences_per_subscription.xml b/res/xml/preferences_per_subscription.xml
index 63c6ee7..ee377b2 100644
--- a/res/xml/preferences_per_subscription.xml
+++ b/res/xml/preferences_per_subscription.xml
@@ -62,22 +62,6 @@
             android:entryValues="@array/save_time_values"
             android:defaultValue="0" />
 
-        <ListPreference android:key="@string/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="@string/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="@string/priority_mms_pref_key"
             android:title="@string/priority_pref_title"
             android:dialogTitle="@string/priority_pref_title"