commit 665b392177a989b67b0b5384e50d0c19c52024ab
author Sunny Goyal <sunnygoyal@google.com> Thu Mar 26 20:50:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 26 20:50:56 2015 +0000
tree 7b90ac757b3bf8335e921be085a67977da18c5d4
parent 9dace138d84d91cd22ec5fb8ce85e3278d5feeb6
parent 2f0ec85acf035c28b799e31d860b7785266ab1f3

am 2f0ec85a: Disabling overscroll when folder has only one page

* commit '2f0ec85acf035c28b799e31d860b7785266ab1f3':
  Disabling overscroll when folder has only one page

src/com/android/launcher3/FolderPagedView.java

diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java
index 6a13a13..216e68d 100644
--- a/src/com/android/launcher3/FolderPagedView.java
+++ b/src/com/android/launcher3/FolderPagedView.java
@@ -485,10 +485,12 @@
             mPageIndicator.setVisibility(View.VISIBLE);
             mSortButton.setVisibility(View.VISIBLE);
             mFolder.mFolderName.setGravity(Gravity.START);
+            setEnableOverscroll(true);
         } else {
             mPageIndicator.setVisibility(View.GONE);
             mSortButton.setVisibility(View.GONE);
             mFolder.mFolderName.setGravity(Gravity.CENTER_HORIZONTAL);
+            setEnableOverscroll(false);
         }
     }
 

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index e7049e2..158a30c 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1702,7 +1702,7 @@
         setEnableOverscroll(!freeScroll);
     }
 
-    private void setEnableOverscroll(boolean enable) {
+    protected void setEnableOverscroll(boolean enable) {
         mAllowOverScroll = enable;
     }