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

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

Merge "Cosmetic changes around TextView."

parents f5574e0f 2d0e87b6

core/java/android/text/Selection.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -417,8 +417,8 @@ public class Selection { 
        }

        }

    }

    }





    private static final class START implements NoCopySpan { };

    private static final class START implements NoCopySpan { }

    private static final class END implements NoCopySpan { };

    private static final class END implements NoCopySpan { }

    

    

    /*

    /*

     * Public constants

     * Public constants

core/java/android/view/AbsSavedState.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ public abstract class AbsSavedState implements Parcelable { 
     */

     */

    protected AbsSavedState(Parcel source) {

    protected AbsSavedState(Parcel source) {

        // FIXME need class loader

        // FIXME need class loader

        Parcelable superState = (Parcelable) source.readParcelable(null);

        Parcelable superState = source.readParcelable(null);

         

         

        mSuperState = superState != null ? superState : EMPTY_STATE;

        mSuperState = superState != null ? superState : EMPTY_STATE;

    }

    }
@@ -75,7 +75,7 @@ public abstract class AbsSavedState implements Parcelable { 
        = new Parcelable.Creator<AbsSavedState>() {

        = new Parcelable.Creator<AbsSavedState>() {

        

        

        public AbsSavedState createFromParcel(Parcel in) {

        public AbsSavedState createFromParcel(Parcel in) {

            Parcelable superState = (Parcelable) in.readParcelable(null);

            Parcelable superState = in.readParcelable(null);

            if (superState != null) {

            if (superState != null) {

                throw new IllegalStateException("superState must be null");

                throw new IllegalStateException("superState must be null");

            }

            }

core/java/android/view/MotionEvent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -722,7 +722,7 @@ public final class MotionEvent implements Parcelable { 
     * 

     * 

     * @param pointerId The identifier of the pointer to be found.

     * @param pointerId The identifier of the pointer to be found.

     * @return Returns either the index of the pointer (for use with

     * @return Returns either the index of the pointer (for use with

     * {@link #getX(int) et al.), or -1 if there is no data available for

     * {@link #getX(int)} et al.), or -1 if there is no data available for

     * that pointer identifier.

     * that pointer identifier.

     */

     */

    public final int findPointerIndex(int pointerId) {

    public final int findPointerIndex(int pointerId) {

core/java/android/widget/TextView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -7709,14 +7709,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                                mOffsetX = (bounds.left + bounds.right) / 2.0f - x;

                                mOffsetX = (bounds.left + bounds.right) / 2.0f - x;

                                mOffsetY = bounds.top - mCursorControllerVerticalOffset - y;

                                mOffsetY = bounds.top - mCursorControllerVerticalOffset - y;





                                mOnDownTimerStart = System.currentTimeMillis();

                                mOnDownTimerStart = event.getEventTime();

                            }

                            }

                        }

                        }

                        break;

                        break;

                    }

                    }





                    case MotionEvent.ACTION_UP : {

                    case MotionEvent.ACTION_UP : {

                        int time = (int) (System.currentTimeMillis() - mOnDownTimerStart);

                        int time = (int) (event.getEventTime() - mOnDownTimerStart);





                        if (time <= ViewConfiguration.getTapTimeout()) {

                        if (time <= ViewConfiguration.getTapTimeout()) {

                            // A tap on the controller is not grabbed, move the cursor instead

                            // A tap on the controller is not grabbed, move the cursor instead