Merge "Bug 5150869: Text selection enabled in browser." (1329192f) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+35 −27

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,6 @@

	package android.widget;		package android.widget;

	import com.android.internal.util.FastMath;
	import com.android.internal.widget.EditableInputConnection;

	import org.xmlpull.v1.XmlPullParserException;

	import android.R;		import android.R;
	import android.content.ClipData;		import android.content.ClipData;
	import android.content.ClipData.Item;		import android.content.ClipData.Item;
	@@ -139,6 +134,11 @@ import android.view.inputmethod.InputConnection;
	import android.view.inputmethod.InputMethodManager;		import android.view.inputmethod.InputMethodManager;
	import android.widget.RemoteViews.RemoteView;		import android.widget.RemoteViews.RemoteView;

			import com.android.internal.util.FastMath;
			import com.android.internal.widget.EditableInputConnection;

			import org.xmlpull.v1.XmlPullParserException;

	import java.io.IOException;		import java.io.IOException;
	import java.lang.ref.WeakReference;		import java.lang.ref.WeakReference;
	import java.text.BreakIterator;		import java.text.BreakIterator;
	@@ -2493,6 +2493,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	* @attr ref android.R.styleable#TextView_scrollHorizontally		* @attr ref android.R.styleable#TextView_scrollHorizontally
	*/		*/
	public void setHorizontallyScrolling(boolean whether) {		public void setHorizontallyScrolling(boolean whether) {
			if (mHorizontallyScrolling != whether) {
	mHorizontallyScrolling = whether;		mHorizontallyScrolling = whether;

	if (mLayout != null) {		if (mLayout != null) {
	@@ -2501,6 +2502,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	invalidate();		invalidate();
	}		}
	}		}
			}

	/**		/**
	* Makes the TextView at least this many lines tall.		* Makes the TextView at least this many lines tall.
	@@ -2699,8 +2701,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	* @attr ref android.R.styleable#TextView_lineSpacingMultiplier		* @attr ref android.R.styleable#TextView_lineSpacingMultiplier
	*/		*/
	public void setLineSpacing(float add, float mult) {		public void setLineSpacing(float add, float mult) {
	mSpacingMult = mult;		if (mSpacingAdd != add \|\| mSpacingMult != mult) {
	mSpacingAdd = add;		mSpacingAdd = add;
			mSpacingMult = mult;

	if (mLayout != null) {		if (mLayout != null) {
	nullLayouts();		nullLayouts();
	@@ -2708,6 +2711,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	invalidate();		invalidate();
	}		}
	}		}
			}

	/**		/**
	* Convenience method: Append the specified text to the TextView's		* Convenience method: Append the specified text to the TextView's
	@@ -6276,6 +6280,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	* @attr ref android.R.styleable#TextView_includeFontPadding		* @attr ref android.R.styleable#TextView_includeFontPadding
	*/		*/
	public void setIncludeFontPadding(boolean includepad) {		public void setIncludeFontPadding(boolean includepad) {
			if (mIncludePad != includepad) {
	mIncludePad = includepad;		mIncludePad = includepad;

	if (mLayout != null) {		if (mLayout != null) {
	@@ -6284,6 +6289,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	invalidate();		invalidate();
	}		}
	}		}
			}

	private static final BoringLayout.Metrics UNKNOWN_BORING = new BoringLayout.Metrics();		private static final BoringLayout.Metrics UNKNOWN_BORING = new BoringLayout.Metrics();

	@@ -6605,7 +6611,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	} else {		} else {
	// Dynamic width, so we have no choice but to request a new		// Dynamic width, so we have no choice but to request a new
	// view layout with a new text layout.		// view layout with a new text layout.

	nullLayouts();		nullLayouts();
	requestLayout();		requestLayout();
	invalidate();		invalidate();
	@@ -7098,6 +7103,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	* @attr ref android.R.styleable#TextView_ellipsize		* @attr ref android.R.styleable#TextView_ellipsize
	*/		*/
	public void setEllipsize(TextUtils.TruncateAt where) {		public void setEllipsize(TextUtils.TruncateAt where) {
			// TruncateAt is an enum. != comparison is ok between these singleton objects.
			if (mEllipsize != where) {
	mEllipsize = where;		mEllipsize = where;

	if (mLayout != null) {		if (mLayout != null) {
	@@ -7106,6 +7113,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	invalidate();		invalidate();
	}		}
	}		}
			}

	/**		/**
	* Sets how many times to repeat the marquee animation. Only applied if the		* Sets how many times to repeat the marquee animation. Only applied if the