diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-12-02 16:11:22 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:20 -0700 |
| commit | 5ac8afb534befb1317d58edf6d789730652f09af (patch) | |
| tree | 3f78336a4694c76bb209123fbc6139a47c460df0 /src | |
| parent | e35719b5900378675f70c68effa92f64ba8385f2 (diff) | |
| download | android_packages_apps_Trebuchet-5ac8afb534befb1317d58edf6d789730652f09af.tar.gz android_packages_apps_Trebuchet-5ac8afb534befb1317d58edf6d789730652f09af.tar.bz2 android_packages_apps_Trebuchet-5ac8afb534befb1317d58edf6d789730652f09af.zip | |
Fix NPE when going to All Apps in landscape
Change-Id: I4bf1e935ad09e5100a7e54039537af69dd90d7ee
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 2605121e7..6e8604582 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2384,20 +2384,22 @@ public class Workspace extends SmoothPagedView if (pageIndicator != null) { pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator) .alpha(finalHotseatAndPageIndicatorAlpha).withLayer(); + pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator)); } else { // create a dummy animation so we don't need to do null checks later pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0); } + Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat) .alpha(finalHotseatAndPageIndicatorAlpha).withLayer(); + hotseatAlpha.addListener(new AlphaUpdateListener(hotseat)); + Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar) .alpha(finalSearchBarAlpha).withLayer(); + if (mShowSearchBar) searchBarAlpha.addListener(new AlphaUpdateListener(searchBar)); + Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel) .alpha(finalOverviewPanelAlpha).withLayer(); - - pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator)); - hotseatAlpha.addListener(new AlphaUpdateListener(hotseat)); - if (mShowSearchBar) searchBarAlpha.addListener(new AlphaUpdateListener(searchBar)); overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel)); if (workspaceToOverview) { |