summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java26
1 files changed, 2 insertions, 24 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 767e33278..919c60a34 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -300,8 +300,7 @@ public class Workspace extends PagedView
boolean mScrollInteractionBegan;
boolean mStartedSendingScrollEvents;
float mLastOverlayScroll = 0;
- // Total over scrollX in the overlay direction.
- private int mUnboundedScrollX;
+
private boolean mForceDrawAdjacentPages = false;
// Total over scrollX in the overlay direction.
private float mOverlayTranslation;
@@ -1321,18 +1320,10 @@ public class Workspace extends PagedView
onOverlayScrollChanged(0);
}
- @Override
- protected int getUnboundedScrollX() {
- if (isScrollingOverlay()) {
- return mUnboundedScrollX;
- }
-
- return super.getUnboundedScrollX();
- }
private boolean isScrollingOverlay() {
return mLauncherOverlay != null &&
- ((mIsRtl && mUnboundedScrollX > mMaxScrollX) || (!mIsRtl && mUnboundedScrollX < 0));
+ ((mIsRtl && getUnboundedScrollX() > mMaxScrollX) || (!mIsRtl && getUnboundedScrollX() < 0));
}
@Override
@@ -1352,12 +1343,6 @@ public class Workspace extends PagedView
}
@Override
- public void scrollTo(int x, int y) {
- mUnboundedScrollX = x;
- super.scrollTo(x, y);
- }
-
- @Override
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
@@ -1530,13 +1515,6 @@ public class Workspace extends PagedView
}
@Override
- protected void getEdgeVerticalPosition(int[] pos) {
- View child = getChildAt(getPageCount() - 1);
- pos[0] = child.getTop();
- pos[1] = child.getBottom();
- }
-
- @Override
protected void notifyPageSwitchListener() {
super.notifyPageSwitchListener();