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/PagedView.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/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 59292a0c8..b258dfd7d 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -261,6 +261,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private int DELETE_SLIDE_IN_SIDE_PAGE_DURATION = 250; private int DRAG_TO_DELETE_FADE_OUT_DURATION = 350; + protected boolean mEnforceRealBounds = false; // Drop to delete private View mDeleteDropTarget; @@ -663,7 +664,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @Override public void scrollTo(int x, int y) { // In free scroll mode, we clamp the scrollX - if (mFreeScroll) { + if (mFreeScroll || mEnforceRealBounds) { x = Math.min(x, mFreeScrollMaxScrollX); x = Math.max(x, mFreeScrollMinScrollX); } |