Revert edge glow effect and restore damped overscroll

Bug 62628421

Change-Id: Iab6ac567e98e63ade34de8817c3ae1f58c25ba19
This commit is contained in:
Adam Cohen
2017-06-23 17:27:38 -07:00
parent 374d170f96
commit 8d769d6620
4 changed files with 80 additions and 454 deletions
+2 -24
View File
@@ -301,8 +301,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;
@@ -1322,18 +1321,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();