diff options
| author | Joseph Moghadam <jmoghadam@google.com> | 2017-03-27 23:30:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-27 23:30:16 +0000 |
| commit | 41aadd16be48b5b84c1cb126b927eaa0e16a004e (patch) | |
| tree | 992d8ea30b9b1fa16ab9654ab2d80f3d92b24814 | |
| parent | b0b269f884b19821edcd8f058d159eb04d3ac0e0 (diff) | |
| parent | 13ca2fbcb437a940abb054b5b582ef6c21faaf25 (diff) | |
| download | chips-41aadd16be48b5b84c1cb126b927eaa0e16a004e.tar.gz | |
Fix warning icon behavior for RTL languages. am: 1c4ebfe46e am: 8ad40f68a5 am: dd04d5e3b4 am: a5dc025935
am: 13ca2fbcb4
Change-Id: Icc0035cf5bbb28fce7c88fc3077a37e7cadf456c
| -rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 13 |
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); } } |