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

Commit 557d1480 authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary dependencies" into rvc-dev am: 0cec4a1f am: 245c30fa 

Change-Id: Iaccf83d8192264f4376fb4c4822cca14ae1498f5
parents ec4db58f 245c30fa

packages/CarSystemUI/res/values/config.xml

+9 −9
Original line number Diff line number Diff line
@@ -86,25 +86,25 @@ 
    <string-array name="config_systemUIServiceComponents" translatable="false">

        <item>com.android.systemui.util.NotificationChannels</item>

        <item>com.android.systemui.keyguard.KeyguardViewMediator</item>

        <item>com.android.systemui.recents.Recents</item>

<!--        <item>com.android.systemui.recents.Recents</item>-->

        <item>com.android.systemui.volume.VolumeUI</item>

        <item>com.android.systemui.stackdivider.Divider</item>

<!--        <item>com.android.systemui.stackdivider.Divider</item>-->

<!--        <item>com.android.systemui.statusbar.phone.StatusBar</item>-->

        <item>com.android.systemui.usb.StorageNotification</item>

        <item>com.android.systemui.power.PowerUI</item>

        <item>com.android.systemui.media.RingtonePlayer</item>

        <item>com.android.systemui.keyboard.KeyboardUI</item>

        <item>com.android.systemui.pip.PipUI</item>

        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>

<!--        <item>com.android.systemui.keyboard.KeyboardUI</item>-->

<!--        <item>com.android.systemui.pip.PipUI</item>-->

<!--        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>-->

        <item>@string/config_systemUIVendorServiceComponent</item>

        <item>com.android.systemui.util.leak.GarbageMonitor$Service</item>

        <item>com.android.systemui.LatencyTester</item>

        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>

<!--        <item>com.android.systemui.LatencyTester</item>-->

<!--        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>-->

        <item>com.android.systemui.ScreenDecorations</item>

        <item>com.android.systemui.biometrics.AuthController</item>

        <item>com.android.systemui.SliceBroadcastRelayHandler</item>

<!--        <item>com.android.systemui.SliceBroadcastRelayHandler</item>-->

        <item>com.android.systemui.SizeCompatModeActivityController</item>

        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>

<!--        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>-->

        <item>com.android.systemui.theme.ThemeOverlayController</item>

        <item>com.android.systemui.navigationbar.car.CarNavigationBar</item>

        <item>com.android.systemui.toast.ToastUI</item>

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+0 −4
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; 
import com.android.systemui.statusbar.AutoHideUiElement;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.phone.AutoHideController;

import com.android.systemui.statusbar.phone.BarTransitions;

import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
@@ -80,7 +79,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
    private final Handler mMainHandler;

    private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final SuperStatusBarViewFactory mSuperStatusBarViewFactory;

    private final ButtonSelectionStateController mButtonSelectionStateController;

    private final PhoneStatusBarPolicy mIconPolicy;

    private final StatusBarIconController mIconController;
@@ -127,7 +125,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
            @Main Handler mainHandler,

            Lazy<KeyguardStateController> keyguardStateControllerLazy,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            ButtonSelectionStateController buttonSelectionStateController,

            PhoneStatusBarPolicy iconPolicy,

            StatusBarIconController iconController
@@ -143,7 +140,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
        mMainHandler = mainHandler;

        mKeyguardStateControllerLazy = keyguardStateControllerLazy;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

        mSuperStatusBarViewFactory = superStatusBarViewFactory;

        mButtonSelectionStateController = buttonSelectionStateController;

        mIconPolicy = iconPolicy;

        mIconController = iconController;

packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarTest.java

+1 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.SysuiTestCase; 
import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.phone.AutoHideController;

import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -75,8 +74,6 @@ public class CarNavigationBarTest extends SysuiTestCase { 
    @Mock

    private NavigationBarController mNavigationBarController;

    @Mock

    private SuperStatusBarViewFactory mSuperStatusBarViewFactory;

    @Mock

    private ButtonSelectionStateController mButtonSelectionStateController;

    @Mock

    private PhoneStatusBarPolicy mIconPolicy;
@@ -92,8 +89,7 @@ public class CarNavigationBarTest extends SysuiTestCase { 
                mCarNavigationBarController, mWindowManager, mDeviceProvisionedController,

                new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener,

                mHandler, () -> mKeyguardStateController, () -> mNavigationBarController,

                mSuperStatusBarViewFactory, mButtonSelectionStateController, mIconPolicy,

                mIconController);

                mButtonSelectionStateController, mIconPolicy, mIconController);

    }



    @Test