Move an initialization line to prevent merge conflicts from tm-qpr-dev
Change-Id: I627ccec2c9b065c8695142190f2bd223cd499bdc Test: n/a
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user