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

Commit 83dbaad1 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Lazy load status icon related components" into rvc-dev am:...

Merge "Merge "Lazy load status icon related components" into rvc-dev am: 71f6afb2 am: c34ec33e" into rvc-d1-dev-plus-aosp
parents 8589cb87 f39bd5b9
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
    private final IStatusBarService mBarService;
    private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;
    private final ButtonSelectionStateController mButtonSelectionStateController;
    private final PhoneStatusBarPolicy mIconPolicy;
    private final StatusBarIconController mIconController;
    private final Lazy<PhoneStatusBarPolicy> mIconPolicyLazy;
    private final Lazy<StatusBarIconController> mIconControllerLazy;

    private final int mDisplayId;

@@ -124,8 +124,8 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
            IStatusBarService barService,
            Lazy<KeyguardStateController> keyguardStateControllerLazy,
            ButtonSelectionStateController buttonSelectionStateController,
            PhoneStatusBarPolicy iconPolicy,
            StatusBarIconController iconController
            Lazy<PhoneStatusBarPolicy> iconPolicyLazy,
            Lazy<StatusBarIconController> iconControllerLazy
    ) {
        super(context);
        mResources = resources;
@@ -140,8 +140,8 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
        mBarService = barService;
        mKeyguardStateControllerLazy = keyguardStateControllerLazy;
        mButtonSelectionStateController = buttonSelectionStateController;
        mIconPolicy = iconPolicy;
        mIconController = iconController;
        mIconPolicyLazy = iconPolicyLazy;
        mIconControllerLazy = iconControllerLazy;

        mDisplayId = context.getDisplayId();
    }
@@ -238,8 +238,8 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
        // Must be called on the main thread due to the use of observeForever() in
        // mIconPolicy.init().
        mMainHandler.post(() -> {
            mIconPolicy.init();
            mSignalPolicy = new StatusBarSignalPolicy(mContext, mIconController);
            mIconPolicyLazy.get().init();
            mSignalPolicy = new StatusBarSignalPolicy(mContext, mIconControllerLazy.get());
        });
    }

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class CarNavigationBarTest extends SysuiTestCase {
                mCarNavigationBarController, mWindowManager, mDeviceProvisionedController,
                new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener,
                mHandler, mBackgroundHandler, mBarService, () -> mKeyguardStateController,
                mButtonSelectionStateController, mIconPolicy, mIconController);
                mButtonSelectionStateController, () -> mIconPolicy,  () -> mIconController);
    }

    @Test