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

Commit b9388f57 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Disabling the desaturation of fast scroll items." into ub-launcher3-burnaby-polish 

am: cbdb1538

* commit 'cbdb1538':
  Disabling the desaturation of fast scroll items.
parents 4ac9a3ca cbdb1538

src/com/android/launcher3/FastBitmapDrawable.java

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class FastBitmapDrawable extends Drawable { 


        NORMAL                      (0f, 0f, 1f, new DecelerateInterpolator()),

        PRESSED                     (0f, 100f / 255f, 1f, CLICK_FEEDBACK_INTERPOLATOR),

        FAST_SCROLL_HIGHLIGHTED     (0f, 0f, 1.1f, new DecelerateInterpolator()),

        FAST_SCROLL_UNHIGHLIGHTED   (0.8f, 0.35f, 1f, new DecelerateInterpolator()),

        FAST_SCROLL_HIGHLIGHTED     (0f, 0f, 1.15f, new DecelerateInterpolator()),

        FAST_SCROLL_UNHIGHLIGHTED   (0f, 0f, 1f, new DecelerateInterpolator()),

        DISABLED                    (1f, 0.5f, 1f, new DecelerateInterpolator());



        public final float desaturation;

src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java

+4 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.HashSet; 


public class AllAppsFastScrollHelper implements AllAppsGridAdapter.BindViewCallback {



    private static final int INITIAL_TOUCH_SETTLING_DURATION = 300;

    private static final int INITIAL_TOUCH_SETTLING_DURATION = 100;

    private static final int REPEAT_TOUCH_SETTLING_DURATION = 200;

    private static final float FAST_SCROLL_TOUCH_VELOCITY_BARRIER = 1900f;
@@ -219,7 +219,9 @@ public class AllAppsFastScrollHelper implements AllAppsGridAdapter.BindViewCallb 
        FastBitmapDrawable.State newState = FastBitmapDrawable.State.NORMAL;

        if (mCurrentFastScrollSection != null && pos > -1) {

            AlphabeticalAppsList.AdapterItem item = mApps.getAdapterItems().get(pos);

            newState = item.sectionName.equals(mCurrentFastScrollSection) ?

            boolean highlight = item.sectionName.equals(mCurrentFastScrollSection) &&

                    item.position == mTargetFastScrollPosition;

            newState = highlight ?

                    FastBitmapDrawable.State.FAST_SCROLL_HIGHLIGHTED :

                    FastBitmapDrawable.State.FAST_SCROLL_UNHIGHLIGHTED;

        }