commit 2b4ffc53a3b51631cb6aabf535986a9344ee6cbb
author Mindy Pereira <mindyp@google.com> Mon Jun 20 13:20:09 2011 -0700
committer Mindy Pereira <mindyp@google.com> Mon Jun 20 13:27:40 2011 -0700
tree 7476394522219b2854fdd470a7f4dcbda4255adb
parent 7afe160db4a48f66c964ced89e29e0b63b23c7c1

Follow defined logic for committing when the user presses space.

If valid email address commit the chip
Fixes Bug:4725531 chips: implement logic to handle space key

Also simplifies the logic for editing in the middle of a chip
(we don't need the submitText flag)

Change-Id: Id4af8d5840f75bf7bb4066e481761a885536dd20

src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index d476dac..66cdabd 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -122,6 +122,8 @@
 
     private static final char COMMIT_CHAR_SEMICOLON = ';';
 
+    private static final char COMMIT_CHAR_SPACE = ' ';
+
     private ListPopupWindow mAlternatesPopup;
 
     /**
@@ -173,6 +175,14 @@
                     char last = s.charAt(length() - 1);
                     if (last == COMMIT_CHAR_SEMICOLON || last == COMMIT_CHAR_COMMA) {
                         commitDefault();
+                    } else if (last == COMMIT_CHAR_SPACE) {
+                        // Check if this is a valid email address. If it is, commit it.
+                        String text = getText().toString();
+                        int tokenStart = mTokenizer.findTokenStart(text, start);
+                        String sub = text.substring(tokenStart, start);
+                        if (mValidator != null && mValidator.isValid(sub)) {
+                            commitDefault();
+                        }
                     }
                 }
             }
@@ -592,7 +602,7 @@
         boolean shouldSubmitAtPosition = false;
         int end = getSelectionEnd();
         int start = mTokenizer.findTokenStart(editable, end);
-        boolean submitText = false;
+
         if (enough) {
             RecipientChip[] chips = getSpannable().getSpans(start, end, RecipientChip.class);
             if ((chips == null || chips.length == 0)) {
@@ -605,7 +615,6 @@
                 // submit the full text token and not what may be in the
                 // suggestions popup.
                 if (end != getSelectionEnd()) {
-                    submitText = true;
                     setSelection(end);
                 }
                 shouldSubmitAtPosition = true;
@@ -613,7 +622,7 @@
         }
 
         if (shouldSubmitAtPosition) {
-            if (!submitText && getAdapter().getCount() > 0) {
+            if (getAdapter().getCount() > 0) {
                 // choose the first entry.
                 submitItemAtPosition(0);
                 dismissDropDown();
@@ -643,6 +652,10 @@
         if (commitCharPosition != -1) {
             text = text.substring(0, commitCharPosition);
         }
+        commitCharPosition = text.indexOf(COMMIT_CHAR_SPACE);
+        if (commitCharPosition != -1 && commitCharPosition != 0) {
+            text = text.substring(0, commitCharPosition);
+        }
         return text;
     }