Remove contact picker menu item

astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java

@@ -293,11 +293,6 @@ public class EditPeopleControlSet extends PopupControlSet {
             contactPickerUser = new AssignedToUser(activity.getString(R.string.actfm_EPA_choose_contact),
                     new JSONObject().put("default_picture", R.drawable.icn_friends)
                     .put(CONTACT_CHOOSER_USER, true));
-            int contactsIndex = addUnassigned ? 2 : 1;
-            boolean addContactPicker = Preferences.getBoolean(R.string.p_use_contact_picker, true) && contactPickerAvailable();
-            if (addContactPicker) {
-                coreUsers.add(contactsIndex, contactPickerUser);
-            }
 
             if (assignedIndex == 0) {
                 assignedIndex = findAssignedIndex(t, coreUsers, listUsers, astridUsers);

astrid/res/values/keys.xml

@@ -349,9 +349,6 @@
 
   <string name="p_swipe_lists_enabled">p_swipe_lists_enabled</string>
   
-  <!-- use new contact picker setting -->
-  <string name="p_use_contact_picker">p_use_contact_picker</string>
-  
   <!-- on calendar end at dealline if true, start at deadline if false -->
   <string name="p_end_at_deadline">p_end_at_deadline</string>
   

astrid/res/xml/preferences.xml

@@ -172,11 +172,7 @@
 	        android:key="@string/p_force_phone_layout"
 	        android:defaultValue="false"/>
         
-        <CheckBoxPreference
-	        android:key="@string/p_use_contact_picker"
-	        android:title="@string/EPr_use_contact_picker"/>
-        
-        <PreferenceScreen android:key="@string/p_configurations" 
+        <PreferenceScreen android:key="@string/p_configurations"
                           android:title="@string/EPr_configurations_title">
             <PreferenceScreen android:title="@string/EPr_config_default" android:key="@string/p_config_default" />
             <PreferenceScreen android:title="@string/EPr_config_lite" android:key="@string/p_config_lite"/>    

astrid/src/com/todoroo/astrid/activity/EditPreferences.java

@@ -419,9 +419,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
         } else if (booleanPreference(preference, value, R.string.p_calendar_reminders,
                 R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled)) {
             ;
-        } else if (booleanPreference(preference, value, R.string.p_use_contact_picker,
-                R.string.EPr_use_contact_picker_desc_disabled, R.string.EPr_use_contact_picker_desc_enabled)) {
-            ;
         } else if (booleanPreference(preference, value, R.string.p_end_at_deadline,
                 R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time)) {
             ;

astrid/src/com/todoroo/astrid/service/MarketStrategy.java

@@ -165,8 +165,7 @@ public abstract class MarketStrategy {
                 R.string.gcal_p_default,
                 R.string.p_theme_widget,
                 R.string.p_voiceInputEnabled,
-                R.string.p_voiceInputCreatesTask,
-                R.string.p_use_contact_picker
+                R.string.p_voiceInputCreatesTask
             };
         }
 

astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java

@@ -92,7 +92,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_fontSize, 16, ifUnset);
         setPreference(prefs, editor, r, R.string.p_showNotes, false, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_use_contact_picker, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_field_missed_calls, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_end_at_deadline, true, ifUnset);

astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java

@@ -80,7 +80,6 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_fontSize, 20, ifUnset);
         setPreference(prefs, editor, r, R.string.p_showNotes, false, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_use_contact_picker, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_field_missed_calls, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_end_at_deadline, true, ifUnset);