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

Commit 4fd71fed authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Remove unused field from KeyguardStatusBarViewController" into main

parents b422d5ca 41a946f3

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

+0 −6
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import com.android.systemui.res.R; 
import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.ShadeViewStateProvider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.disableflags.DisableStateTracker;
@@ -133,9 +132,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
    private View mSystemIconsContainer;

    private final StatusOverlayHoverListenerFactory mStatusOverlayHoverListenerFactory;



    // TODO(b/273443374): remove

    private NotificationMediaManager mNotificationMediaManager;



    private final ConfigurationController.ConfigurationListener mConfigurationListener =

            new ConfigurationController.ConfigurationListener() {

                @Override
@@ -302,7 +298,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            @Main Executor mainExecutor,

            @Background Executor backgroundExecutor,

            KeyguardLogger logger,

            NotificationMediaManager notificationMediaManager,

            StatusOverlayHoverListenerFactory statusOverlayHoverListenerFactory

    ) {

        super(view);
@@ -357,7 +352,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
                /* mask2= */ DISABLE2_SYSTEM_ICONS,

                this::updateViewState

        );

        mNotificationMediaManager = notificationMediaManager;

        mStatusOverlayHoverListenerFactory = statusOverlayHoverListenerFactory;

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java

+0 −4
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import com.android.systemui.res.R; 
import com.android.systemui.shade.ShadeViewStateProvider;

import com.android.systemui.shade.data.repository.FakeShadeRepository;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.data.repository.FakeKeyguardStatusBarRepository;

import com.android.systemui.statusbar.domain.interactor.KeyguardStatusBarInteractor;
@@ -144,8 +143,6 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { 
    @Mock private SecureSettings mSecureSettings;

    @Mock private CommandQueue mCommandQueue;

    @Mock private KeyguardLogger mLogger;



    @Mock private NotificationMediaManager mNotificationMediaManager;

    @Mock private StatusOverlayHoverListenerFactory mStatusOverlayHoverListenerFactory;



    private TestShadeViewStateProvider mShadeViewStateProvider;
@@ -225,7 +222,6 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { 
                mFakeExecutor,

                mBackgroundExecutor,

                mLogger,

                mNotificationMediaManager,

                mStatusOverlayHoverListenerFactory

        );

    }