AI 151312: Add 'Use Mobile' option in Mms Settingcupcake

  Show mobile phones or all types phones in recipients according 'Use
  Mobile' preference
  This change is prepared for michaelbai due to p9 access issue.
  BUG=2051759

Automated import of CL 151312

4 files changed, 24 insertions, 2 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23a5352f..8dab2f58 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -295,6 +295,8 @@
     <string name="pref_mms_settings_title">MMS settings</string>
     <!-- Settings screen, section heading for SMS-specific settings -->
     <string name="pref_sms_settings_title">SMS settings</string>
+    <!-- Settings screen, section heading for recipients suggestion -->
+    <string name="pref_recipients_suggestion_settings_title">Recipients Suggestion setting</string>
 
     <!-- Settings item description for entering SIM card message screen -->
     <string name="pref_summary_manage_sim_messages">Manage messages stored on your SIM card</string>
@@ -331,6 +333,10 @@
     <string name="pref_title_mms_retrieval_during_roaming">Roaming auto-retrieve</string>
     <!-- Settings item description for boolean MMS auto-retrieve while roaming option -->
     <string name="pref_summary_mms_retrieval_during_roaming">Automatically retrieve messages while roaming</string>
+    <!-- Settings item for boolean option to retrieve phone suggestions from mobile -->
+    <string name="pref_title_recipients_suggestion_use_mobile">Use mobile</string>
+    <!-- Settings item description for boolean use mobile option -->
+    <string name="pref_summary_recipients_suggestion_use_mobile">Only get phone suggestion from mobile</string>
 
     <!-- Label prepended to recipient's name in Undelivered Messages screen -->
     <string name="to_label">"To "</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5dafe264..db1b73d7 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -66,4 +66,11 @@
                         android:title="@string/pref_title_notification_vibrate"
                         android:summary="@string/pref_summary_notification_vibrate" />
   </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_recipients_suggestion_settings_title">
+    <CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild"
+                        android:key="pref_key_suggest_mobile"
+                        android:defaultValue="false"
+                        android:title="@string/pref_title_recipients_suggestion_use_mobile"
+                        android:summary="@string/pref_summary_recipients_suggestion_use_mobile" />
+  </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
index 9027e169..85f828e8 100644
--- a/src/com/android/mms/ui/MessagingPreferenceActivity.java
+++ b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -58,6 +58,7 @@ public class MessagingPreferenceActivity extends PreferenceActivity {
     public static final String NOTIFICATION_RINGTONE    = "pref_key_ringtone";
     public static final String AUTO_RETRIEVAL           = "pref_key_mms_auto_retrieval";
     public static final String RETRIEVAL_DURING_ROAMING = "pref_key_mms_retrieval_during_roaming";
+    public static final String SUGGEST_FROM_MOBILE      = "pref_key_suggest_mobile";
 
     // Menu entries
     private static final int MENU_RESTORE_DEFAULTS    = 1;
diff --git a/src/com/android/mms/ui/RecipientsAdapter.java b/src/com/android/mms/ui/RecipientsAdapter.java
index 8fbfab08..e20262f2 100644
--- a/src/com/android/mms/ui/RecipientsAdapter.java
+++ b/src/com/android/mms/ui/RecipientsAdapter.java
@@ -23,10 +23,14 @@ import com.google.android.mms.util.SqliteWrapper;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+
 import com.android.internal.database.ArrayListCursor;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.MergeCursor;
+import android.preference.PreferenceManager;
 import android.provider.Contacts;
 import android.provider.Contacts.ContactMethods;
 import android.provider.Contacts.Phones;
@@ -155,8 +159,12 @@ public class RecipientsAdapter extends ResourceCursorAdapter {
             s.append(filterLastName);
             s.append(") OR (REPLACE(REPLACE(REPLACE(REPLACE(number, ' ', ''), '(', ''), ')', ''), '-', '') LIKE ");
             s.append(filter);
-            s.append(")) AND type = ");
-            s.append(Phones.TYPE_MOBILE);
+            s.append("))");
+            if (PreferenceManager.getDefaultSharedPreferences(mContext).getBoolean(
+                    MessagingPreferenceActivity.SUGGEST_FROM_MOBILE, false)) {
+                s.append(" AND type = ");
+                s.append(Phones.TYPE_MOBILE);
+            }
             wherePhone = s.toString();
         }