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

Commit 2d0e87b6 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Cosmetic changes around TextView. 

Fixed some warnings in the code.

Change-Id: Id19395031a1ab41edcc47e3dc8cd9479c6e19f83
parent f35c96bb

core/java/android/text/Selection.java

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

    }



    private static final class START implements NoCopySpan { };

    private static final class END implements NoCopySpan { };

    private static final class START implements NoCopySpan { }

    private static final class END implements NoCopySpan { }

    

    /*

     * Public constants

core/java/android/view/AbsSavedState.java

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

    protected AbsSavedState(Parcel source) {

        // FIXME need class loader

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

        Parcelable superState = source.readParcelable(null);

         

        mSuperState = superState != null ? superState : EMPTY_STATE;

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

        

        public AbsSavedState createFromParcel(Parcel in) {

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

            Parcelable superState = in.readParcelable(null);

            if (superState != null) {

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

            }

core/java/android/view/MotionEvent.java

+1 −1
Original line number 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.

     * @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.

     */

    public final int findPointerIndex(int pointerId) {

core/java/android/widget/TextView.java

+2 −2
Original line number 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;

                                mOffsetY = bounds.top - mCursorControllerVerticalOffset - y;



                                mOnDownTimerStart = System.currentTimeMillis();

                                mOnDownTimerStart = event.getEventTime();

                            }

                        }

                        break;

                    }



                    case MotionEvent.ACTION_UP : {

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

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



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

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