commit fea0a5f629f7bc59117401b744ed334cf33a7ae0
author Tony Wickham <twickham@google.com> Thu May 19 11:27:55 2016 -0700
committer Tony Wickham <twickham@google.com> Thu May 19 11:27:55 2016 -0700
tree 83860dd1971dd8d4664872a3cb76b9b415f99c72
parent c64cfdd8fa18de45fc1646c8ef2449f39ef83022

Add more null checks for page indicators.

Change-Id: Id86d4827c9079abfb236f956e531f0e29edfc54e

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f8eff69..29ebeb9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1337,7 +1337,9 @@
         // different effects based on device performance. On at least one relatively high-end
         // device I've tried, translating the launcher causes things to get quite laggy.
         setTranslationAndAlpha(mLauncher.getSearchDropTargetBar(), transX, alpha);
-        setTranslationAndAlpha(getPageIndicator().getView(), transX, alpha);
+        if (getPageIndicator() != null) {
+            setTranslationAndAlpha(getPageIndicator().getView(), transX, alpha);
+        }
         setTranslationAndAlpha(getChildAt(getCurrentPage()), transX, alpha);
         setTranslationAndAlpha(mLauncher.getHotseat(), transX, alpha);
 

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 60070a8..38a578c 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -357,7 +357,8 @@
 
         final ViewGroup overviewPanel = mLauncher.getOverviewPanel();
         final View hotseat = mLauncher.getHotseat();
-        final View pageIndicator = mWorkspace.getPageIndicator().getView();
+        final View pageIndicator = mWorkspace.getPageIndicator() == null ? null
+                : mWorkspace.getPageIndicator().getView();
         if (animated) {
             LauncherViewPropertyAnimator scale = new LauncherViewPropertyAnimator(mWorkspace);
             scale.scaleX(mNewScale)