Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix PagedTileLayout reveal animation crash."

Browse Source 
This reverts commit b3ed28c84d.

Reason for revert: <INSERT REASONING HERE>

Change-Id: If1094b0ada1f664da60dc56e1e0f49f75e40adf5
This commit is contained in:
Bill Lin
2018-08-02 13:12:39 +00:00
parent b3ed28c84d
commit 46a48cf0b0
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
View File

@@ -55,6 +55,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
private Scroller mScroller;
private AnimatorSet mBounceAnimatorSet;
private int mAnimatingToPage = -1;
private float mLastExpansion;
public PagedTileLayout(Context context, AttributeSet attrs) {
@@ -93,17 +94,41 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
}
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
// Suppress all touch event during reveal animation.
if (mAnimatingToPage != -1) {
return true;
}
return super.onInterceptTouchEvent(ev);
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
// Suppress all touch event during reveal animation.
if (mAnimatingToPage != -1) {
return true;
}
return super.onTouchEvent(ev);
}
@Override
public void computeScroll() {
if (!mScroller.isFinished() && mScroller.computeScrollOffset()) {
fakeDragBy(getScrollX() - mScroller.getCurrX());
scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
float pageFraction = (float) getScrollX() / getWidth();
int position = (int) pageFraction;
float positionOffset = pageFraction - position;
mOnPageChangeListener.onPageScrolled(position, positionOffset, getScrollX());
// Keep on drawing until the animation has finished.
postInvalidateOnAnimation();
return;
} else if (isFakeDragging()) {
endFakeDrag();
}
if (mAnimatingToPage != -1) {
setCurrentItem(mAnimatingToPage, true);
mBounceAnimatorSet.start();
setOffscreenPageLimit(1);
mAnimatingToPage = -1;
}
super.computeScroll();
}
@@ -262,7 +287,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
}
public void startTileReveal(Set<String> tileSpecs, final Runnable postAnimation) {
if (tileSpecs.isEmpty() || mPages.size() < 2 || getScrollX() != 0 || !beginFakeDrag()) {
if (tileSpecs.isEmpty() || mPages.size() < 2 || getScrollX() != 0) {
// Do not start the reveal animation unless there are tiles to animate, multiple
// TilePages available and the user has not already started dragging.
return;
@@ -292,8 +317,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
postAnimation.run();
}
});
setOffscreenPageLimit(lastPageNumber); // Ensure the page to reveal has been inflated.
mScroller.startScroll(getScrollX(), getScrollY(), getWidth() * lastPageNumber, 0,
mAnimatingToPage = lastPageNumber;
setOffscreenPageLimit(mAnimatingToPage); // Ensure the page to reveal has been inflated.
mScroller.startScroll(getScrollX(), getScrollY(), getWidth() * mAnimatingToPage, 0,
REVEAL_SCROLL_DURATION_MILLIS);
postInvalidateOnAnimation();
}