Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f2cdea authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Bug 4382356: No automatic focus change in ScrollViews"

parents 23399b70 8202cd36

core/java/android/widget/ScrollView.java

+0 −12
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ public class ScrollView extends FrameLayout { 


    static final float MAX_SCROLL_FACTOR = 0.5f;





    private long mLastScroll;



    private final Rect mTempRect = new Rect();
@@ -1431,17 +1430,6 @@ public class ScrollView extends FrameLayout { 


            final boolean movingDown = velocityY > 0;



            View currentFocused = findFocus();

            View newFocused =

                    findFocusableViewInMyBounds(movingDown, mScroller.getFinalY(), currentFocused);

            if (newFocused == null) {

                newFocused = this;

            }



            if (newFocused != currentFocused) {

                    newFocused.requestFocus(movingDown ? View.FOCUS_DOWN : View.FOCUS_UP);

            }



            if (mFlingStrictSpan == null) {

                mFlingStrictSpan = StrictMode.enterCriticalSpan("ScrollView-fling");

            }

core/java/android/widget/TextView.java

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


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.content.ClipData;

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

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.lang.ref.WeakReference;

import java.text.BreakIterator;
@@ -5839,6 +5839,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        if (curs >= 0) {

            mHighlightPathBogus = true;

            makeBlink();

            bringPointIntoView(curs);

        }



        checkForResize();