am 8b7a8ad5: (-s ours) Import translations. DO NOT MERGE
* commit '8b7a8ad508d450576b9c71c6a83e4c671fc01aa5':
Import translations. DO NOT MERGE
diff --git a/sample/res/values-iw/strings.xml b/sample/res/values-iw/strings.xml
index 7ead2ae..c295c34 100644
--- a/sample/res/values-iw/strings.xml
+++ b/sample/res/values-iw/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="email_addresses" msgid="5320415175940315400">"כתובות דוא\"ל"</string>
+ <string name="email_addresses" msgid="5320415175940315400">"כתובות אימייל"</string>
<string name="phone_numbers" msgid="7836326833170390688">"מספרי טלפון"</string>
</resources>
diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 4855d64..4584e58 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -342,7 +342,6 @@
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mAttachedToWindow = false;
- dismissPopups();
}
@Override
@@ -724,7 +723,6 @@
// 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);
@@ -2254,6 +2252,7 @@
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
unselectChip(currentChip);
+ popup.dismiss();
}
});
popup.show();
@@ -2291,7 +2290,9 @@
}
setCursorVisible(true);
setSelection(editable.length());
- dismissPopups();
+ if (mAlternatesPopup != null && mAlternatesPopup.isShowing()) {
+ mAlternatesPopup.dismiss();
+ }
}
@Override