Using material style overscroll effect for workspace and folders

Bug: 21335369
Change-Id: I53cc6edfa87334b9326f1dedd90c3e2222beade5

1 files changed, 11 insertions, 3 deletions

diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java
index b7a5aa8cf..f2ec1b68c 100644
--- a/src/com/android/launcher3/FolderPagedView.java
+++ b/src/com/android/launcher3/FolderPagedView.java
@@ -97,6 +97,8 @@ public class FolderPagedView extends PagedView {
 
         mIsRtl = Utilities.isRtl(getResources());
         setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
+
+        setEdgeGlowColor(getResources().getColor(R.color.folder_edge_effect_color));
     }
 
     public void setFolder(Folder folder) {
@@ -459,16 +461,16 @@ public class FolderPagedView extends PagedView {
                 ? -SCROLL_HINT_FRACTION : SCROLL_HINT_FRACTION;
         int hint = (int) (fraction * getWidth());
         int scroll = getScrollForPage(getNextPage()) + hint;
-        int delta = scroll - mUnboundedScrollX;
+        int delta = scroll - getScrollX();
         if (delta != 0) {
             mScroller.setInterpolator(new DecelerateInterpolator());
-            mScroller.startScroll(mUnboundedScrollX, 0, delta, 0, Folder.SCROLL_HINT_DURATION);
+            mScroller.startScroll(getScrollX(), 0, delta, 0, Folder.SCROLL_HINT_DURATION);
             invalidate();
         }
     }
 
     public void clearScrollHint() {
-        if (mUnboundedScrollX != getScrollForPage(getNextPage())) {
+        if (getScrollX() != getScrollForPage(getNextPage())) {
             snapToPage(getNextPage());
         }
     }
@@ -667,4 +669,10 @@ public class FolderPagedView extends PagedView {
     public int itemsPerPage() {
         return mMaxItemsPerPage;
     }
+
+    @Override
+    protected void getEdgeVerticalPostion(int[] pos) {
+        pos[0] = 0;
+        pos[1] = getViewportHeight();
+    }
 }