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

Commit 3eeee979 authored by Sam Lewis's avatar Sam Lewis Committed by Automerger Merge Worker
Browse files

Merge "fix common typos" into main am: c3c542b5 am: a066f41e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2944365



Change-Id: I6810f03e63d46c07b12cab92bf90a357bc383fad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1e7c315 a066f41e

core/java/android/widget/AbsListView.java

+4 −4
Original line number Diff line number Diff line
@@ -425,12 +425,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
    int mMotionViewNewTop;



    /**

     * The X value associated with the the down motion event

     * The X value associated with the down motion event

     */

    int mMotionX;



    /**

     * The Y value associated with the the down motion event

     * The Y value associated with the down motion event

     */

    @UnsupportedAppUsage

    int mMotionY;
@@ -7381,7 +7381,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 


            scrap.dispatchStartTemporaryDetach();



            // The the accessibility state of the view may change while temporary

            // the accessibility state of the view may change while temporary

            // detached and we do not allow detached views to fire accessibility

            // events. So we are announcing that the subtree changed giving a chance

            // to clients holding on to a view in this subtree to refresh it.
@@ -7750,7 +7750,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
    }



    /**

     * Abstract positon scroller used to handle smooth scrolling.

     * Abstract position scroller used to handle smooth scrolling.

     */

    static abstract class AbsPositionScroller {

        public abstract void start(int position);

core/java/android/widget/AbsSpinner.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public abstract class AbsSpinner extends AdapterView<SpinnerAdapter> { 
     * @see android.view.View#measure(int, int)

     *

     * Figure out the dimensions of this Spinner. The width comes from

     * the widthMeasureSpec as Spinnners can't have their width set to

     * the widthMeasureSpec as Spinners can't have their width set to

     * UNSPECIFIED. The height is based on the height of the selected item

     * plus padding.

     */