Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev am: 997e4ac2bb
am: 727b06b498
Change-Id: I5bb0e7dd6712316f0e349795fb9d607a7bc92b9c
diff --git a/core/java/com/android/internal/widget/ImageFloatingTextView.java b/core/java/com/android/internal/widget/ImageFloatingTextView.java
index 6b53368..31b167d 100644
--- a/core/java/com/android/internal/widget/ImageFloatingTextView.java
+++ b/core/java/com/android/internal/widget/ImageFloatingTextView.java
@@ -22,6 +22,7 @@
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextUtils;
+import android.text.method.TransformationMethod;
import android.util.AttributeSet;
import android.view.RemotableViewMethod;
import android.widget.RemoteViews;
@@ -68,7 +69,12 @@
protected Layout makeSingleLayout(int wantWidth, BoringLayout.Metrics boring, int ellipsisWidth,
Layout.Alignment alignment, boolean shouldEllipsize,
TextUtils.TruncateAt effectiveEllipsize, boolean useSaved) {
- CharSequence text = getText() == null ? "" : getText();
+ TransformationMethod transformationMethod = getTransformationMethod();
+ CharSequence text = getText();
+ if (transformationMethod != null) {
+ text = transformationMethod.getTransformation(text, this);
+ }
+ text = text == null ? "" : text;
StaticLayout.Builder builder = StaticLayout.Builder.obtain(text, 0, text.length(),
getPaint(), wantWidth)
.setAlignment(alignment)
diff --git a/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java b/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
index a249925..1806b22 100644
--- a/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
+++ b/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
@@ -21,9 +21,11 @@
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
+import android.text.Layout;
import android.view.View.MeasureSpec;
import android.widget.TextView;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -102,6 +104,16 @@
+ "Yada yada, yada yada. Lorem ipsum dolor sit amet.");
}
+ @Test
+ public void usesTransformationMethod() {
+ mView.setSingleLine();
+ String text = "Test \n Test";
+ parametrizedTest(text);
+ Layout layout = mView.getLayout();
+ Assert.assertFalse("The transformation method wasn't used, string is still the same",
+ text.equals(layout.getText()));
+ }
+
private void parametrizedTest(CharSequence text) {
int heightMeasureSpec = MeasureSpec.makeMeasureSpec(500, MeasureSpec.AT_MOST);
int widthMeasureSpec = MeasureSpec.makeMeasureSpec(500, MeasureSpec.EXACTLY);