summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-05-19 12:45:40 -0700
committerTony Wickham <twickham@google.com>2016-05-19 12:45:40 -0700
commitddb77003e728cac32de009e709f80280e68f6b6e (patch)
tree4139ed19dea3ed571c0be3d0cc3d49dfd69a4220
parentfea0a5f629f7bc59117401b744ed334cf33a7ae0 (diff)
downloadandroid_packages_apps_Trebuchet-ddb77003e728cac32de009e709f80280e68f6b6e.tar.gz
android_packages_apps_Trebuchet-ddb77003e728cac32de009e709f80280e68f6b6e.tar.bz2
android_packages_apps_Trebuchet-ddb77003e728cac32de009e709f80280e68f6b6e.zip
Missed one more page indicator null check.
Hopefully this is the last one. Change-Id: I1af4f7058834fe0ba60ccc8752a6bf0df64be473
-rw-r--r--src/com/android/launcher3/Workspace.java6
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