Merge "Revert "Set movement method to the focusable text"" (fe8a1e0a) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -2439,12 +2439,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* Subclasses override this to specify a default movement method.
		*/
		protected MovementMethod getDefaultMovementMethod() {
		if (isFocusable() \|\| isFocusableInTouchMode()) {
		return ArrowKeyMovementMethod.getInstance();
		} else {
		return null;
		}
		}

		/**
		* Return the text that TextView is displaying. If {@link #setText(CharSequence)} was called
		@@ -2658,12 +2654,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* Gets the {@link android.text.method.MovementMethod} being used for this TextView,
		* which provides positioning, scrolling, and text selection functionality.
		* By default, this returns an instance of {@link android.text.method.ArrowKeyMovementMethod}
		* if this View is focusable or focusable in touch mode.
		*
		* This will frequently be null for non-EditText TextViews.
		* @return the movement method being used for this TextView.
		* @see android.text.method.MovementMethod
		* @see android.text.method.ArrowKeyMovementMethod
		*/
		public final MovementMethod getMovementMethod() {
		return mMovement;