Revert an unnecessary change
I5e9631f258b8d273777c65f3f5460f1aa71f10b1 no longer appears to be
necessary, and was causing jank. It was effectively reverted in Gmail
UR8, and this change just removes the remaining code.
Bug: 8316009
Change-Id: I9c1309cccf57a1e6e7d75eb017aa09add57d2c4a
diff --git a/chips/src/com/android/ex/chips/InvisibleRecipientChip.java b/chips/src/com/android/ex/chips/InvisibleRecipientChip.java
index 83f7f8e..452c2b8 100644
--- a/chips/src/com/android/ex/chips/InvisibleRecipientChip.java
+++ b/chips/src/com/android/ex/chips/InvisibleRecipientChip.java
@@ -41,9 +41,6 @@
private CharSequence mOriginalText;
- /** <code>true</code> to display the original text, <code>false</code> to display nothing */
- private boolean mDisplayOriginalText = false;
-
public InvisibleRecipientChip(RecipientEntry entry, int offset) {
super();
mDisplay = entry.getDisplayName();
@@ -114,28 +111,16 @@
return !TextUtils.isEmpty(mOriginalText) ? mOriginalText : mEntry.getDestination();
}
- public void setDisplayOriginalText(final boolean displayOriginalText) {
- mDisplayOriginalText = displayOriginalText;
- }
-
@Override
public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y,
int bottom, Paint paint) {
- if (mDisplayOriginalText) {
- canvas.drawText(text, start, end, x, y, paint);
- } else {
- // Do nothing.
- }
+ // Do nothing.
}
@Override
public int getSize(
Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
- if (mDisplayOriginalText) {
- return (int) paint.measureText(text, start, end);
- } else {
- return 0;
- }
+ return 0;
}
@Override
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index c1a6f87..2c1967d 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -1865,13 +1865,6 @@
end = chipEnd = Math.min(editable.length(), chipStart + token.length());
// Only set the span if we found a matching token.
if (chipStart != -1) {
- if (chip instanceof InvisibleRecipientChip) {
- /*
- * We want the original text to be displayed until we can replace it
- * with a real chip
- */
- // ((InvisibleRecipientChip) chip).setDisplayOriginalText(true);
- }
editable.setSpan(chip, chipStart, chipEnd,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
