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

Merge "Add try/catch to prevent NPE in PagedTileLayout" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-13 16:21:21 +00:00
committed by Android (Google) Code Review
parent c9ffc840f5 545f25077e
commit 1daf6ea6a3
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,6 +151,27 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
}
}
@Override
public void fakeDragBy(float xOffset) {
try {
super.fakeDragBy(xOffset);
// Keep on drawing until the animation has finished.
postInvalidateOnAnimation();
} catch (NullPointerException e) {
Log.e(TAG, "FakeDragBy called before begin", e);
// If we were trying to fake drag, it means we just added a new tile to the last
// page, so animate there.
final int lastPageNumber = mPages.size() - 1;
post(() -> {
setCurrentItem(lastPageNumber, true);
if (mBounceAnimatorSet != null) {
mBounceAnimatorSet.start();
}
setOffscreenPageLimit(1);
});
}
}
@Override
public void computeScroll() {
if (!mScroller.isFinished() && mScroller.computeScrollOffset()) {
@@ -158,9 +179,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
beginFakeDrag();
}
fakeDragBy(getScrollX() - mScroller.getCurrX());
// Keep on drawing until the animation has finished.
postInvalidateOnAnimation();
return;
} else if (isFakeDragging()) {
endFakeDrag();
mBounceAnimatorSet.start();