diff options
| author | Tony Wickham <twickham@google.com> | 2016-05-19 20:05:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 20:05:29 +0000 |
| commit | cc792b5142af3a210477465d93fbd5d02f52b382 (patch) | |
| tree | 4139ed19dea3ed571c0be3d0cc3d49dfd69a4220 | |
| parent | 60777ecd868ca6fe4a0154189a0a87cbd44bcd58 (diff) | |
| parent | ddb77003e728cac32de009e709f80280e68f6b6e (diff) | |
| download | android_packages_apps_Trebuchet-cc792b5142af3a210477465d93fbd5d02f52b382.tar.gz android_packages_apps_Trebuchet-cc792b5142af3a210477465d93fbd5d02f52b382.tar.bz2 android_packages_apps_Trebuchet-cc792b5142af3a210477465d93fbd5d02f52b382.zip | |
Missed one more page indicator null check.
am: ddb77003e7
* commit 'ddb77003e728cac32de009e709f80280e68f6b6e':
Missed one more page indicator null check.
Change-Id: I8b24824ddcf8894daf5be52dc743da20e9627792
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 29ebeb9df..0df657dfb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1275,13 +1275,15 @@ public class Workspace extends PagedView // Update the page indicator progress. boolean isTransitioning = mIsSwitchingState || (getLayoutTransition() != null && getLayoutTransition().isRunning()); - if (mPageIndicator != null && !isTransitioning) { + if (!isTransitioning) { showPageIndicatorAtCurrentScroll(); } } private void showPageIndicatorAtCurrentScroll() { - mPageIndicator.setScroll(getScrollX(), computeMaxScrollX()); + if (mPageIndicator != null) { + mPageIndicator.setScroll(getScrollX(), computeMaxScrollX()); + } } @Override |