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

Commit bf8ebf8e authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Move an initialization line to prevent merge conflicts from tm-qpr-dev" into udc-dev

parents 5ca1770b 3fc25cda

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mStatusBarSignalPolicy = statusBarSignalPolicy;

        mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager;

        mFeatureFlags = featureFlags;

        mIsShortcutListSearchEnabled = featureFlags.isEnabled(Flags.SHORTCUT_LIST_SEARCH_LAYOUT);

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

        mMainExecutor = delayableExecutor;

        mMessageRouter = messageRouter;
@@ -872,7 +873,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mCameraLauncherLazy = cameraLauncherLazy;

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        mUserTracker = userTracker;

        mIsShortcutListSearchEnabled = featureFlags.isEnabled(Flags.SHORTCUT_LIST_SEARCH_LAYOUT);



        mLockscreenShadeTransitionController = lockscreenShadeTransitionController;

        mStartingSurfaceOptional = startingSurfaceOptional;