diff options
| author | Tony Wickham <twickham@google.com> | 2016-05-19 18:48:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 18:48:18 +0000 |
| commit | 60777ecd868ca6fe4a0154189a0a87cbd44bcd58 (patch) | |
| tree | 83860dd1971dd8d4664872a3cb76b9b415f99c72 | |
| parent | c8e0fced52803f27ecaff234b1b6950b7b9fb18e (diff) | |
| parent | fea0a5f629f7bc59117401b744ed334cf33a7ae0 (diff) | |
| download | android_packages_apps_Trebuchet-60777ecd868ca6fe4a0154189a0a87cbd44bcd58.tar.gz android_packages_apps_Trebuchet-60777ecd868ca6fe4a0154189a0a87cbd44bcd58.tar.bz2 android_packages_apps_Trebuchet-60777ecd868ca6fe4a0154189a0a87cbd44bcd58.zip | |
Add more null checks for page indicators.
am: fea0a5f629
* commit 'fea0a5f629f7bc59117401b744ed334cf33a7ae0':
Add more null checks for page indicators.
Change-Id: I3db6a16e0f0edf0891dbec3c91f1776a21ab9b70
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f8eff6987..29ebeb9df 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1337,7 +1337,9 @@ public class Workspace extends PagedView // 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); diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 60070a810..38a578c85 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -357,7 +357,8 @@ public class WorkspaceStateTransitionAnimation { 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) |