From 9dc4359197be80dd5f5ba8026143444b30db0db0 Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Thu, 13 Oct 2022 12:12:41 +0000 Subject: [PATCH] Revert "Set movement method to the focusable text" This reverts commit 8b5927e5e24568caf09c4b096c21198bb120f0dd. Reason for revert: Likely causing b/253410666, won't be submitted until proven by tests. Change-Id: I5417cfc22afb8a7c8d85c4964a4dfebf47bcb7a7 --- core/java/android/widget/TextView.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 2d70f6e09b231..b339d76938afe 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -2438,11 +2438,7 @@ 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 null; } /** @@ -2657,12 +2653,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;