summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Moghadam <jmoghadam@google.com>2017-03-27 23:33:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 23:33:16 +0000
commitc2caea51a544454509e96e08c8af25a63cbbc6b6 (patch)
treebcdde21a2df40ca3331255e03c915ec2222e3397
parent1261965d340e0a53c3a9e13b17790788ea07b99c (diff)
parent41aadd16be48b5b84c1cb126b927eaa0e16a004e (diff)
downloadchips-c2caea51a544454509e96e08c8af25a63cbbc6b6.tar.gz
Fix warning icon behavior for RTL languages. am: 1c4ebfe46e am: 8ad40f68a5 am: dd04d5e3b4 am: a5dc025935 am: 13ca2fbcb4
am: 41aadd16be Change-Id: Iba5f17b2538d8adcb03884b6367b2fcf533aa221
-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);
}
}