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

Commit f0988f1f authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Prevent NPE inside AllAppsTransitionController 

Bug: 181911438
Test: manual

Change-Id: Ia2cfe43512c0336232fc6787eb955d476280e3b8
parent a6554759

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+12 −5
Original line number Diff line number Diff line
@@ -144,11 +144,14 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>, 
     */

    public void setProgress(float progress) {

        mProgress = progress;



        mScrimView.setProgress(progress);

        float shiftCurrent = progress * mShiftRange;



        mAppsView.setTranslationY(shiftCurrent);

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {

            if (mInsetController == null) {

                setupInsetTransitionController();

            }

            mInsetController.setProgress(progress);

        }

    }
@@ -240,12 +243,16 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>, 
        mAppsView = appsView;

        mScrimView = scrimView;

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {

            setupInsetTransitionController();

        }

    }



    private void setupInsetTransitionController() {

        mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);

        mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,

                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN

                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);

    }

    }



    /**

     * Updates the total scroll range but does not update the UI.