Move the voice input directly creates tasks preference

astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java

@@ -79,6 +79,12 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
                 String setting = listPreference.getEntries()[index].toString();
                 preference.setSummary(r.getString(R.string.EPr_default_addtocalendar_desc, setting));
             }
+        } else if (r.getString(R.string.p_voiceInputCreatesTask).equals(preference.getKey())) {
+            preference.setEnabled(Preferences.getBoolean(R.string.p_voiceInputEnabled, false));
+            if (value != null && !(Boolean)value)
+                preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_disabled);
+            else
+                preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_enabled);
         }
     }
 

astrid/res/xml/preferences.xml

@@ -161,12 +161,6 @@
 	            android:key="@string/p_voiceInputEnabled"
 	            android:title="@string/EPr_voiceInputEnabled_title"
 	            android:defaultValue="true" />
-	                
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_voiceInputCreatesTask"
-	            android:title="@string/EPr_voiceInputCreatesTask_title"
-	            android:dependency="@string/p_voiceInputEnabled"
-	            android:defaultValue="false" />
         </PreferenceScreen>
         
         <com.todoroo.astrid.ui.MultilineCheckboxPreference

astrid/res/xml/preferences_defaults.xml

@@ -42,4 +42,8 @@
         android:key="@string/gcal_p_default"
         android:entries="@array/EPr_default_addtocalendar"
         android:entryValues="@array/EPr_default_addtocalendar_values" />
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+        android:key="@string/p_voiceInputCreatesTask"
+        android:title="@string/EPr_voiceInputCreatesTask_title"
+        android:defaultValue="false" />
 </PreferenceScreen>

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

@@ -611,11 +611,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
             else
                 preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_enabled);
             onVoiceReminderStatusChanged(preference, (Boolean)value);
-        } else if (r.getString(R.string.p_voiceInputCreatesTask).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value)
-                preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_disabled);
-            else
-                preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_enabled);
         }
     }