commit dd04d5e3b44b1e3a9fa6b9019a2270ee6e205f87
author Joseph Moghadam <jmoghadam@google.com> Mon Mar 27 23:20:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 23:20:15 2017 +0000
tree a600570f298acdc44e15352d6e6ec28a7504b36f
parent 42605ce011ea5c5b287968398bf5d56a04ec7cf0
parent 8ad40f68a5aae429af7f006f0fca131f70e7962c

Fix warning icon behavior for RTL languages. am: 1c4ebfe46e
am: 8ad40f68a5

Change-Id: Id4c633f58eb5f07e38e0816db4fd45f2f3c59de2

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 29ecbd2..d9655a5 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -1990,11 +1990,16 @@
         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);
             }
         }