diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-06 17:22:29 -0700 |
|---|---|---|
| committer | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-09 14:18:23 -0700 |
| commit | 3ac0f662ac96fb2f3eb89ce706bae311e821c9ce (patch) | |
| tree | 3ad6dd030d7d3dce32c5bb22e23f12f09754d026 /src/com/android/launcher3/Workspace.java | |
| parent | 67f228ab613104a94b06ac322ef68cf167b9c5dc (diff) | |
| download | android_packages_apps_Trebuchet-3ac0f662ac96fb2f3eb89ce706bae311e821c9ce.tar.gz android_packages_apps_Trebuchet-3ac0f662ac96fb2f3eb89ce706bae311e821c9ce.tar.bz2 android_packages_apps_Trebuchet-3ac0f662ac96fb2f3eb89ce706bae311e821c9ce.zip | |
When CustomContent is enabled prevent it from displaying in OverView mode
Change-Id: Iebcedb0d2bee3e6cd400847190e05916db87d265
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 3a464e0ae..bba10a118 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2261,8 +2261,8 @@ public class Workspace extends SmoothPagedView if (oldStateIsOverview) { disableFreeScroll(); - } else if (stateIsOverview) { - enableFreeScroll(); + } else if (stateIsOverview){ + updateFreescrollBounds(); } if (state != State.NORMAL) { @@ -4895,4 +4895,10 @@ public class Workspace extends SmoothPagedView public boolean getHideIconLables() { return mHideIconLabels; } + + @Override + public void scrollTo(int x, int y) { + mEnforceRealBounds = isInOverviewMode(); + super.scrollTo(x, y); + } } |