summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values-bn-rBD/strings.xml2
-rw-r--r--res/values-eu-rES/strings.xml2
-rw-r--r--res/values-gl-rES/strings.xml2
-rw-r--r--res/values-is-rIS/strings.xml2
-rw-r--r--res/values-kk-rKZ/strings.xml2
-rw-r--r--res/values-kn-rIN/strings.xml2
-rw-r--r--res/values-ky-rKG/strings.xml2
-rw-r--r--res/values-mk-rMK/strings.xml2
-rw-r--r--res/values-ml-rIN/strings.xml2
-rw-r--r--res/values-mr-rIN/strings.xml2
-rw-r--r--res/values-my-rMM/strings.xml2
-rw-r--r--res/values-ne-rNP/strings.xml2
-rw-r--r--res/values-si-rLK/strings.xml2
-rw-r--r--res/values-ta-rIN/strings.xml2
-rw-r--r--res/values-te-rIN/strings.xml2
-rw-r--r--res/values-ur-rPK/strings.xml2
-rw-r--r--res/values-uz-rUZ/strings.xml2
-rw-r--r--src/com/android/ex/chips/RecipientEditTextView.java19
18 files changed, 23 insertions, 30 deletions
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index e8dde0d..9ed010a 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>টি"</string>
<string name="copy_email" msgid="7869435992461603532">"ইমেল ঠিকানা অনুলিপি করুন"</string>
<string name="copy_number" msgid="530057841276106843">"ফোন নম্বর অনুলিপি করুন"</string>
- <string name="done" msgid="2356320650733788862">"ফেরত যান"</string>
+ <string name="action_label" msgid="1318401633653605424">"ফেরত যান"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 7af993d..e01d212 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Kopiatu helbide elektronikoa"</string>
<string name="copy_number" msgid="530057841276106843">"Kopiatu telefono-zenbakia"</string>
- <string name="done" msgid="2356320650733788862">"Itzuli"</string>
+ <string name="action_label" msgid="1318401633653605424">"Itzuli"</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index df992d2..cf60278 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Copiar enderezo de correo electrónico"</string>
<string name="copy_number" msgid="530057841276106843">"Copiar número de teléfono"</string>
- <string name="done" msgid="2356320650733788862">"Volver"</string>
+ <string name="action_label" msgid="1318401633653605424">"Volver"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index a8186cc..ba687ce 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Afrita netfang"</string>
<string name="copy_number" msgid="530057841276106843">"Afrita símanúmer"</string>
- <string name="done" msgid="2356320650733788862">"Til baka"</string>
+ <string name="action_label" msgid="1318401633653605424">"Venda"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 925eca5..afb7047 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Эл.поштаның көшірмесін жасау"</string>
<string name="copy_number" msgid="530057841276106843">"Телефон нөмірінің көшірмесін жасау"</string>
- <string name="done" msgid="2356320650733788862">"Қалпына келтіру"</string>
+ <string name="action_label" msgid="1318401633653605424">"Қайтару"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 7befc86..2d4e96d 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಕಲಿಸಿ"</string>
<string name="copy_number" msgid="530057841276106843">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
- <string name="done" msgid="2356320650733788862">"ಹಿಂತಿರುಗು"</string>
+ <string name="action_label" msgid="1318401633653605424">"ಹಿಂತಿರುಗು"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 5d5434c..f08ed7b 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Эмейл даректи көчүрүү"</string>
<string name="copy_number" msgid="530057841276106843">"Телефон номурун көчүрүү"</string>
- <string name="done" msgid="2356320650733788862">"Кайтуу"</string>
+ <string name="action_label" msgid="1318401633653605424">"Кайтуу"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 25e067a..f2b15bf 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"Копирај адреса на е-пошта"</string>
<string name="copy_number" msgid="530057841276106843">"Копирај телефонски број"</string>
- <string name="done" msgid="2356320650733788862">"Врати"</string>
+ <string name="action_label" msgid="1318401633653605424">"Врати"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 3bd6d8d..84a9832 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"<xliff:g id="COUNT">%1$s</xliff:g> എണ്ണം കൂടി"</string>
<string name="copy_email" msgid="7869435992461603532">"ഇമെയിൽ വിലാസം പകർത്തുക"</string>
<string name="copy_number" msgid="530057841276106843">"ഫോൺ നമ്പർ പകർത്തുക"</string>
- <string name="done" msgid="2356320650733788862">"മടങ്ങുക"</string>
+ <string name="action_label" msgid="1318401633653605424">"മടങ്ങുക"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index f7090f5..eb8a278 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"ईमेल पत्ता कॉपी करा"</string>
<string name="copy_number" msgid="530057841276106843">"फोन नंबर कॉपी करा"</string>
- <string name="done" msgid="2356320650733788862">"परत"</string>
+ <string name="action_label" msgid="1318401633653605424">"परत"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index bae3e6b..884d985 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"အီးမေးလ်လိပ်စာ ကူးထည့်ရန်"</string>
<string name="copy_number" msgid="530057841276106843">"ဖုန်းနံပါတ် ကူးထည့်ရန်"</string>
- <string name="done" msgid="2356320650733788862">"ရယူရန်"</string>
+ <string name="action_label" msgid="1318401633653605424">"နောက်ပြန်ရန်"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 4710484..d44c25d 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"इमेल ठेगानाको प्रतिलिपि बनाउनुहोस्"</string>
<string name="copy_number" msgid="530057841276106843">"फोन नम्बरको प्रतिलिपि गर्नुहोस्"</string>
- <string name="done" msgid="2356320650733788862">"फिर्ता हुनुहोस्"</string>
+ <string name="action_label" msgid="1318401633653605424">"फर्कनुहोस्"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 313405f..fa58395 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"ඊ-තැපැල් ලිපිනය පිටපත් කරන්න"</string>
<string name="copy_number" msgid="530057841276106843">"දුරකථන අංකය පිටපත් කරන්න"</string>
- <string name="done" msgid="2356320650733788862">"ආපසු එවන්න"</string>
+ <string name="action_label" msgid="1318401633653605424">"ආපසු එවන්න"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 5573731..22df3b9 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"மின்னஞ்சல் முகவரியை நகலெடு"</string>
<string name="copy_number" msgid="530057841276106843">"மொபைல் எண்ணை நகலெடு"</string>
- <string name="done" msgid="2356320650733788862">"திரும்பு"</string>
+ <string name="action_label" msgid="1318401633653605424">"திரும்பு"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 8b02426..dcd4289 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"ఇమెయిల్ చిరునామాను కాపీ చేయండి"</string>
<string name="copy_number" msgid="530057841276106843">"ఫోన్ నంబర్‌ను కాపీ చేయండి"</string>
- <string name="done" msgid="2356320650733788862">"తిరిగి వెళ్లు"</string>
+ <string name="action_label" msgid="1318401633653605424">"తిరిగివెళ్లు"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index e36ec06..4ec74d3 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"‎+<xliff:g id="COUNT">%1$s</xliff:g>"</string>
<string name="copy_email" msgid="7869435992461603532">"ای میل پتہ کاپی کریں"</string>
<string name="copy_number" msgid="530057841276106843">"فون نمبر کاپی کریں"</string>
- <string name="done" msgid="2356320650733788862">"واپس جائیں"</string>
+ <string name="action_label" msgid="1318401633653605424">"واپس جائیں"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 01e8833..ac66d2e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -19,5 +19,5 @@
<string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$s</xliff:g> ta"</string>
<string name="copy_email" msgid="7869435992461603532">"E-pochta manzilidan nusxa olish"</string>
<string name="copy_number" msgid="530057841276106843">"Telefon raqamidan nusxa olish"</string>
- <string name="done" msgid="2356320650733788862">"Qaytish"</string>
+ <string name="action_label" msgid="1318401633653605424">"Enter"</string>
</resources>
diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index e6f4c35..cca6b52 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -327,7 +327,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mAttachedToWindow = false;
- dismissPopups();
}
@Override
@@ -705,7 +704,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
// Draw the default chip background
mWorkPaint.reset();
mWorkPaint.setColor(backgroundColor);
- mWorkPaint.setAntiAlias(true);
final float radius = height / 2;
canvas.drawRoundRect(new RectF(0, 0, width, height), radius, radius,
mWorkPaint);
@@ -2255,6 +2253,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
unselectChip(currentChip);
+ popup.dismiss();
}
});
popup.show();
@@ -2292,7 +2291,9 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
}
setCursorVisible(true);
setSelection(editable.length());
- dismissPopups();
+ if (mAlternatesPopup != null && mAlternatesPopup.isShowing()) {
+ mAlternatesPopup.dismiss();
+ }
}
@Override
@@ -2300,16 +2301,8 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
if (mSelectedChip != null) {
removeChip(mSelectedChip);
}
- dismissPopups();
- }
-
- private void dismissPopups() {
- if (mAlternatesPopup != null && mAlternatesPopup.isShowing()) {
- mAlternatesPopup.dismiss();
- }
- if (mAddressPopup != null && mAddressPopup.isShowing()) {
- mAddressPopup.dismiss();
- }
+ mAddressPopup.dismiss();
+ mAlternatesPopup.dismiss();
}
/**