From a6721a2c3592201380453aca8fe28b3e72be9a20 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 27 Mar 2013 12:02:01 -0700
Subject: [PATCH] Move the voice input directly creates tasks preference

---
 .../com/todoroo/astrid/core/DefaultsPreferences.java        | 6 ++++++
 astrid/res/xml/preferences.xml                              | 6 ------
 astrid/res/xml/preferences_defaults.xml                     | 4 ++++
 astrid/src/com/todoroo/astrid/activity/EditPreferences.java | 5 -----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
index 831377f6e..9748ef508 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
+++ b/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);
         }
     }
 
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index c13168c17..c5dc16fad 100644
--- a/astrid/res/xml/preferences.xml
+++ b/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
diff --git a/astrid/res/xml/preferences_defaults.xml b/astrid/res/xml/preferences_defaults.xml
index 3c1dd9ddc..bde937184 100644
--- a/astrid/res/xml/preferences_defaults.xml
+++ b/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>
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 330855312..7bf3c0e01 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/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);
         }
     }