summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Moghadam <jmoghadam@google.com>2017-03-27 23:23:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 23:23:46 +0000
commita5dc0259358431a45b654fb352eb6048af47c659 (patch)
treea600570f298acdc44e15352d6e6ec28a7504b36f
parent59f1f298306b45f93f1f7e696ff227da01bc503d (diff)
parentdd04d5e3b44b1e3a9fa6b9019a2270ee6e205f87 (diff)
downloadchips-a5dc0259358431a45b654fb352eb6048af47c659.tar.gz
Fix warning icon behavior for RTL languages. am: 1c4ebfe46e am: 8ad40f68a5
am: dd04d5e3b4 Change-Id: I938bf80d2179632b39e71ad587e50a1b54fbe9ec
-rw-r--r--src/com/android/ex/chips/RecipientEditTextView.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 29ecbd2..d9655a5 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -1990,11 +1990,16 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
if (currentChip != null) {
Rect outOfDomainWarningBounds = currentChip.getWarningIconBounds();
if (outOfDomainWarningBounds != null) {
+ int chipLeftOffset = shouldPositionAvatarOnRight()
+ ? getChipEnd(currentChip) : getChipStart(currentChip);
+ float chipLeftPosition = this.getLayout().getPrimaryHorizontal(chipLeftOffset);
+ float chipTopPosition = this.getLayout().getLineTop(
+ this.getLayout().getLineForOffset(chipLeftOffset)) + getTotalPaddingTop();
final RectF touchOutOfDomainWarning = new RectF(
- outOfDomainWarningBounds.left,
- outOfDomainWarningBounds.top + getTotalPaddingTop(),
- outOfDomainWarningBounds.right,
- outOfDomainWarningBounds.bottom + getTotalPaddingTop());
+ chipLeftPosition + outOfDomainWarningBounds.left,
+ chipTopPosition + outOfDomainWarningBounds.top,
+ chipLeftPosition + outOfDomainWarningBounds.right,
+ chipTopPosition + outOfDomainWarningBounds.bottom);
touchedWarningIcon = touchOutOfDomainWarning.contains(x, y);
}
}