Merge "Multiline EditText have top and bottom brackets to differentiate from single line." (c50f1505) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		int mTextSelectHandleRes;
		int mTextEditPasteWindowLayout;
		int mTextEditNoPasteWindowLayout;
		Drawable mEditTextMultilineBackground;
		Drawable mEditTextSingleLineBackground;

		Drawable mSelectHandleLeft;
		Drawable mSelectHandleRight;
		@@ -751,6 +753,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mTextEditNoPasteWindowLayout = a.getResourceId(attr, 0);
		break;

		case com.android.internal.R.styleable.TextView_multilineBackground:
		mEditTextMultilineBackground = a.getDrawable(attr);
		break;

		case com.android.internal.R.styleable.TextView_textLineHeight:
		int lineHeight = a.getDimensionPixelSize(attr, 0);
		if (lineHeight != 0) {
		@@ -765,6 +771,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		a.recycle();

		mEditTextSingleLineBackground = getBackground();
		BufferType bufferType = BufferType.EDITABLE;

		final int variation =
		@@ -6192,12 +6199,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		if (applyTransformation) {
		setTransformationMethod(SingleLineTransformationMethod.getInstance());
		}
		setBackgroundDrawable(mEditTextSingleLineBackground);
		} else {
		setMaxLines(Integer.MAX_VALUE);
		setHorizontallyScrolling(false);
		if (applyTransformation) {
		setTransformationMethod(null);
		}
		setBackgroundDrawable(mEditTextMultilineBackground);
		}
		}

0 → 100644

+1.07 KiB

Loading image diff...

0 → 100644

+1.07 KiB

Loading image diff...

+895 B (1.06 KiB)

Loading image diff...

+904 B (1.06 KiB)

Loading image diff...