diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-27 10:05:28 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-06-19 19:53:34 +0000 |
commit | 4d113a5ff44ff1a7f19263bde21581fbf9a54212 (patch) | |
tree | d80c55262936ed1c4ebd265fcf72adfad095a859 /src/com/android/launcher3/Workspace.java | |
parent | e91a14c6986660253996018982d500a728585199 (diff) | |
download | android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.tar.gz android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.tar.bz2 android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.zip |
Using material style overscroll effect for workspace and folders
Bug: 21335369
Change-Id: I53cc6edfa87334b9326f1dedd90c3e2222beade5
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 44 |
1 files changed, 10 insertions, 34 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 76f872bae..fb0a54d3c 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -197,7 +197,6 @@ public class Workspace extends PagedView private static final Rect sTempRect = new Rect(); private final int[] mTempXY = new int[2]; private int[] mTempVisiblePagesRange = new int[2]; - private boolean mOverscrollEffectSet; public static final int DRAG_BITMAP_PADDING = 2; private boolean mWorkspaceFadeInAdjacentScreens; @@ -257,8 +256,6 @@ public class Workspace extends PagedView private float mCurrentScale; private float mTransitionProgress; - float mOverScrollEffect = 0f; - @Thunk Runnable mDeferredAction; private boolean mDeferDropAfterUninstall; private boolean mUninstallSuccessful; @@ -443,6 +440,8 @@ public class Workspace extends PagedView // Set the wallpaper dimensions when Launcher starts up setWallpaperDimension(); + + setEdgeGlowColor(getResources().getColor(R.color.workspace_edge_effect_color)); } private void setupLayoutTransition() { @@ -1260,9 +1259,6 @@ public class Workspace extends PagedView mLauncherOverlay.onScrollChange(progress, mIsRtl); } else if (shouldOverScroll) { dampedOverScroll(amount); - mOverScrollEffect = acceleratedOverFactor(amount); - } else { - mOverScrollEffect = 0; } if (shouldZeroOverlay) { @@ -1271,6 +1267,13 @@ public class Workspace extends PagedView } @Override + protected void getEdgeVerticalPostion(int[] pos) { + View child = getChildAt(getPageCount() - 1); + pos[0] = child.getTop(); + pos[1] = child.getBottom(); + } + + @Override protected void notifyPageSwitchListener() { super.notifyPageSwitchListener(); @@ -1540,11 +1543,9 @@ public class Workspace extends PagedView } private void updatePageAlphaValues(int screenCenter) { - boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; if (mWorkspaceFadeInAdjacentScreens && !workspaceInModalState() && - !mIsSwitchingState && - !isInOverscroll) { + !mIsSwitchingState) { for (int i = numCustomPages(); i < getChildCount(); i++) { CellLayout child = (CellLayout) getChildAt(i); if (child != null) { @@ -1654,34 +1655,9 @@ public class Workspace extends PagedView @Override protected void screenScrolled(int screenCenter) { - super.screenScrolled(screenCenter); - updatePageAlphaValues(screenCenter); updateStateForCustomContent(screenCenter); enableHwLayersOnVisiblePages(); - - boolean shouldOverScroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; - - if (shouldOverScroll) { - int index = 0; - final int lowerIndex = 0; - final int upperIndex = getChildCount() - 1; - - final boolean isLeftPage = mOverScrollX < 0; - index = (!mIsRtl && isLeftPage) || (mIsRtl && !isLeftPage) ? lowerIndex : upperIndex; - - CellLayout cl = (CellLayout) getChildAt(index); - float effect = Math.abs(mOverScrollEffect); - cl.setOverScrollAmount(Math.abs(effect), isLeftPage); - - mOverscrollEffectSet = true; - } else { - if (mOverscrollEffectSet && getChildCount() > 0) { - mOverscrollEffectSet = false; - ((CellLayout) getChildAt(0)).setOverScrollAmount(0, false); - ((CellLayout) getChildAt(getChildCount() - 1)).setOverScrollAmount(0, false); - } - } } protected void onAttachedToWindow() { |