diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-03-26 13:38:27 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-03-26 13:38:27 -0700 |
commit | 2f0ec85acf035c28b799e31d860b7785266ab1f3 (patch) | |
tree | 76ab1b66be11b6dcf3b2debb4ef69f1a7d8d3491 /src/com | |
parent | 28f4188bacad6a1e72cbed04ff3af1597d234cad (diff) | |
download | android_packages_apps_Trebuchet-2f0ec85acf035c28b799e31d860b7785266ab1f3.tar.gz android_packages_apps_Trebuchet-2f0ec85acf035c28b799e31d860b7785266ab1f3.tar.bz2 android_packages_apps_Trebuchet-2f0ec85acf035c28b799e31d860b7785266ab1f3.zip |
Disabling overscroll when folder has only one page
Change-Id: I3cc3964dba1af8d96822e46baf2dc9cfaee824ae
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/FolderPagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index 6a13a1385..216e68dcc 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -485,10 +485,12 @@ public class FolderPagedView extends PagedView implements Folder.FolderContent { 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); } } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index e7049e2ac..158a30c40 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1702,7 +1702,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc setEnableOverscroll(!freeScroll); } - private void setEnableOverscroll(boolean enable) { + protected void setEnableOverscroll(boolean enable) { mAllowOverScroll = enable; } |