PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2015-10-28 22:35:00 +00:00
committed by Android (Google) Code Review
parent c3d76582b6 c08c59de07
commit cbdb153893
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FastBitmapDrawable.java
+2 -2
View File
@@ -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
View File
@@ -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;
}