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

Commit 8a747de7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8712667 from a500cde8 to tm-release 

Change-Id: I2a83783000dcb043236e9a72c6ff97502b1ab724
parents 4f17c430 a500cde8

src/com/android/launcher3/logging/StatsLogManager.java

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ public class StatsLogManager implements ResourceBasedOverride { 
            COLD(1),

            HOT(2),

            TIMEOUT(3),

            FAIL(4);

            FAIL(4),

            COLD_USERWAITING(5);



            private final int mId;

src/com/android/launcher3/views/RecyclerViewFastScroller.java

+1 −2
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ public class RecyclerViewFastScroller extends View { 
                }

                break;

            case MotionEvent.ACTION_UP:

                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                        getApplicationWindowToken());

            case MotionEvent.ACTION_CANCEL:

                mRv.onFastScrollCompleted();

                mTouchOffsetY = 0;
@@ -310,6 +308,7 @@ public class RecyclerViewFastScroller extends View { 
    }



    private void calcTouchOffsetAndPrepToFastScroll(int downY, int lastY) {

        hideKeyboardAsync(ActivityContext.lookupContext(getContext()), getWindowToken());

        mIsDragging = true;

        if (mCanThumbDetach) {

            mIsThumbDetached = true;