From 5ac8afb534befb1317d58edf6d789730652f09af Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 2 Dec 2013 16:11:22 -0800 Subject: Fix NPE when going to All Apps in landscape Change-Id: I4bf1e935ad09e5100a7e54039537af69dd90d7ee --- src/com/android/launcher3/Workspace.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/com/android/launcher3/Workspace.java') 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) { -- cgit v1.2.3