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

Commit 193f8992 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge "Fix null-pointer exception in all set activity first reveal animation" into tm-qpr-dev

parents 1eb1e036 912a53e6

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+3 −2
Original line number Diff line number Diff line
@@ -958,12 +958,13 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        }

        mControllers.taskbarStashController.addUnstashToHotseatAnimation(fullAnimation, duration);



        if (!FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) {

        View allAppsButton = mControllers.taskbarViewController.getAllAppsButtonView();

        if (allAppsButton != null && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) {

            ValueAnimator alphaOverride = ValueAnimator.ofFloat(0, 1);

            alphaOverride.setDuration(duration);

            alphaOverride.addUpdateListener(a -> {

                // Override the alpha updates in the icon alignment animation.

                mControllers.taskbarViewController.getAllAppsButtonView().setAlpha(0);

                allAppsButton.setAlpha(0);

            });

            fullAnimation.play(alphaOverride);

        }

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
    /**

     * Returns the all apps button in the taskbar.

     */

    @Nullable

    public View getAllAppsButtonView() {

        return mAllAppsButton;

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
        return mTaskbarView.getIconViews();

    }



    @Nullable

    public View getAllAppsButtonView() {

        return mTaskbarView.getAllAppsButtonView();

    }