diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-03-28 23:07:22 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-03-28 23:07:22 -0700 |
| commit | 8f8f0949d93424f2b769dce5773770198fcb8dcd (patch) | |
| tree | d090dc9114a5816952b9b9916c69ff50d903469a | |
| parent | c29e30afc25ca6c936b20fad85fd47a0fcf95bbf (diff) | |
| parent | ecbe4bd029872a15df8f2e8cf45d568b19cc3bd4 (diff) | |
| download | android_frameworks_ex-8f8f0949d93424f2b769dce5773770198fcb8dcd.tar.gz android_frameworks_ex-8f8f0949d93424f2b769dce5773770198fcb8dcd.tar.bz2 android_frameworks_ex-8f8f0949d93424f2b769dce5773770198fcb8dcd.zip | |
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/frameworks/ex into aosp
| -rw-r--r-- | carousel/test/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | chips/res/values-es-rUS/strings.xml | 2 | ||||
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/carousel/test/res/values-de/strings.xml b/carousel/test/res/values-de/strings.xml index ddf2caa..3dd5491 100644 --- a/carousel/test/res/values-de/strings.xml +++ b/carousel/test/res/values-de/strings.xml @@ -23,6 +23,6 @@ <string name="carousel_test_activity_label" msgid="6014624482213318747">"CarouselTest"</string> <string name="carousel_test_activity_description" msgid="1632693812604375483">"Eine App, um die Verwendung des Karussells zu demonstrieren"</string> <string name="task_switcher_activity_label" msgid="714620143340933546">"Aufgabenwechsel"</string> - <string name="recent_tasks_title" msgid="1030287226205477117">"Zuletzt verwendete Apps"</string> + <string name="recent_tasks_title" msgid="1030287226205477117">"Kürzlich geöffnete Apps"</string> <string name="no_recent_tasks" msgid="6884096266670555780">"Keine neuen Aufgaben"</string> </resources> diff --git a/chips/res/values-es-rUS/strings.xml b/chips/res/values-es-rUS/strings.xml index 0f8e6c5..0b7d10a 100644 --- a/chips/res/values-es-rUS/strings.xml +++ b/chips/res/values-es-rUS/strings.xml @@ -18,5 +18,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="more_string" msgid="8971577924280885648">"<xliff:g id="COUNT">%1$s</xliff:g> más..."</string> <string name="chips_waiting_for_directory_result" msgid="4210117336820180232">"Esperando más contactos"</string> - <string name="copy" msgid="7946975650226308595">"Copiar dirección de correo electrónico"</string> + <string name="copy" msgid="7946975650226308595">"Copiar dirección de correo"</string> </resources> diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 1149641..a3d73e4 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -331,7 +331,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements shrink(); } else { expand(); - scrollLineIntoView(getLineCount()); } } @@ -760,6 +759,10 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements */ // Visible for testing. /*package*/ void sanitizeEnd() { + // Don't sanitize while we are waiting for pending chips to complete. + if (mPendingChipsCount > 0) { + return; + } // Find the last chip; eliminate any commit characters after it. RecipientChip[] chips = getSortedRecipients(); if (chips != null && chips.length > 0) { @@ -1047,6 +1050,10 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements // Visible for testing. /* package */ void sanitizeBetween() { + // Don't sanitize while we are waiting for content to chipify. + if (mPendingChipsCount > 0) { + return; + } // Find the last chip. RecipientChip[] recips = getSortedRecipients(); if (recips != null && recips.length > 0) { |