From dda550937702e6ee52235158e0c064e313aab74e Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 18 Nov 2014 14:01:16 -0600
Subject: [PATCH] Update edit text control

* Show/hide cursor
* Disable multiline text entry
---
 .../todoroo/astrid/ui/EditTitleControlSet.java | 18 ++++++++++++++++++
 .../src/main/res/layout/control_set_title.xml  |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index abf9cc6e2..614a55cbb 100644
--- a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -14,7 +14,9 @@ import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.view.animation.Animation;
 import android.view.animation.ScaleAnimation;
+import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.adapter.TaskAdapter;
@@ -61,6 +63,22 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
                 return false;
             }
         });
+        editText.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                editText.setCursorVisible(true);
+                editText.moveCursorToVisibleOffset();
+            }
+        });
+        editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    editText.setCursorVisible(false);
+                }
+                return false;
+            }
+        });
         this.completeBox = (CheckableImageView) getView().findViewById(R.id.completeBox);
     }
 
diff --git a/astrid/src/main/res/layout/control_set_title.xml b/astrid/src/main/res/layout/control_set_title.xml
index 29626dd90..03c9252a9 100644
--- a/astrid/src/main/res/layout/control_set_title.xml
+++ b/astrid/src/main/res/layout/control_set_title.xml
@@ -26,6 +26,7 @@
 
     <com.todoroo.astrid.ui.ErrorCatchingEditText
         android:id="@+id/title"
+        android:cursorVisible="false"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="100"
@@ -34,7 +35,7 @@
         android:capitalize="sentences"
         android:freezesText="true"
         android:hint="@string/TEA_title_hint"
-        android:inputType="textMultiLine|textCapSentences"
+        android:inputType="textCapSentences"
         android:scrollbars="vertical"
         android:imeOptions="flagNoExtractUi"
         android:text=""