Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fa074d authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 1c00fd0b: Fix NPE when going to All Apps in landscape

* commit '1c00fd0b':
  Fix NPE when going to All Apps in landscape
parents 0c1b33db 1c00fd0b
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -2235,20 +2235,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();
            searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));

            Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel)
                .alpha(finalOverviewPanelAlpha).withLayer();

            pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
            hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
            searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
            overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));

            if (workspaceToOverview) {