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

Commit 8693f82d authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change If1f0bf33 into eclair

* changes:
  Some work on issue #2286804: sometimes text field doesn't accept input
parents 59c06278 27d37722
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.text.Layout;
import android.text.NoCopySpan;
import android.text.Layout.Alignment;
import android.text.Spannable;
import android.util.Log;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
import android.widget.TextView;
@@ -156,8 +157,17 @@ public class Touch {
                                                            padding));
                    ny = Math.max(ny, 0);
        
                    int oldX = widget.getScrollX();
                    int oldY = widget.getScrollY();

                    scrollTo(widget, layout, nx, ny);

                    // If we actually scrolled, then cancel the up action.
                    if (oldX != widget.getScrollX()
                            || oldY != widget.getScrollY()) {
                        widget.cancelLongPress();
                    }

                    return true;
                }
            }
+1 −4
Original line number Diff line number Diff line
@@ -6529,6 +6529,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
            // Reset this state; it will be re-set if super.onTouchEvent
            // causes focus to move to the view.
            mTouchFocusSelected = false;
            mScrolled = false;
        }
        
        final boolean superResult = super.onTouchEvent(event);
@@ -6545,10 +6546,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

        if ((mMovement != null || onCheckIsTextEditor()) && mText instanceof Spannable && mLayout != null) {
            
            if (action == MotionEvent.ACTION_DOWN) {
                mScrolled = false;
            }
            
            boolean handled = false;
            
            int oldSelStart = Selection.getSelectionStart(mText);