From a2d82be07d23bc48cfd0142fb5b14e1621d6e707 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 20 Jun 2014 08:09:46 -0500
Subject: [PATCH] Move hide until to task edit screen

---
 .../java/com/todoroo/astrid/activity/TaskEditFragment.java     | 2 +-
 astrid/src/main/res/values/keys.xml                            | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 41168bf18..3ca6b31e7 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -419,7 +419,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 R.layout.control_set_default_display,
                 R.string.hide_until_prompt);
         controls.add(hideUntilControls);
-        reminderControl.addViewToBody(hideUntilControls.getDisplayView());
+        controlSetMap.put(getString(R.string.TEA_ctrl_hide_until_pref), hideUntilControls);
 
         // TODO: Fix the fact that hideUntil doesn't update accordingly with date changes when lazy loaded. Until then, don't lazy load.
         hideUntilControls.getView();
diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml
index e183ac727..b2839eb0b 100644
--- a/astrid/src/main/res/values/keys.xml
+++ b/astrid/src/main/res/values/keys.xml
@@ -259,6 +259,7 @@
       <item >@string/TEA_control_lists</item>
       <item >@string/TEA_control_notes</item>
       <item >@string/TEA_control_files</item>
+      <item>@string/TEA_hideUntil_label</item>
       <item >@string/TEA_control_reminders</item>
       <item >@string/TEA_control_timer</item>
       <item >@string/TEA_control_hidden_section</item>
@@ -271,6 +272,7 @@
   <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
   <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
   <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
+    <string name="TEA_ctrl_hide_until_pref">TEA_ctrl_hide_until_pref</string>
   <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
   <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
   <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
@@ -285,6 +287,7 @@
       <item>@string/TEA_ctrl_lists_pref</item>
       <item>@string/TEA_ctrl_notes_pref</item>
       <item>@string/TEA_ctrl_files_pref</item>
+      <item>@string/TEA_ctrl_hide_until_pref</item>
       <item>@string/TEA_ctrl_reminders_pref</item>
       <item>@string/TEA_ctrl_timer_pref</item>
       <item>@string/TEA_ctrl_hide_section_pref</item>