Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary dependencies" into rvc-dev am: 0cec4a1f4f

Browse Source 
Change-Id: I45ebd4e5169d4ae9be286473ceda8dc69f57d419
This commit is contained in:
Heemin Seog
2020-04-21 19:48:25 +00:00
committed by Automerger Merge Worker
parent 4ecde6af45 0cec4a1f4f
commit 4d02deadff
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/CarSystemUI/res/values/config.xml
View File

@@ -86,25 +86,25 @@
<string-array name="config_systemUIServiceComponents" translatable="false"> <string-array name="config_systemUIServiceComponents" translatable="false">
<item>com.android.systemui.util.NotificationChannels</item> <item>com.android.systemui.util.NotificationChannels</item>
<item>com.android.systemui.keyguard.KeyguardViewMediator</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.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.statusbar.phone.StatusBar</item>-->
<item>com.android.systemui.usb.StorageNotification</item> <item>com.android.systemui.usb.StorageNotification</item>
<item>com.android.systemui.power.PowerUI</item> <item>com.android.systemui.power.PowerUI</item>
<item>com.android.systemui.media.RingtonePlayer</item> <item>com.android.systemui.media.RingtonePlayer</item>
<item>com.android.systemui.keyboard.KeyboardUI</item> <!-- <item>com.android.systemui.keyboard.KeyboardUI</item>-->
<item>com.android.systemui.pip.PipUI</item> <!-- <item>com.android.systemui.pip.PipUI</item>-->
<item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item> <!-- <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>-->
<item>@string/config_systemUIVendorServiceComponent</item> <item>@string/config_systemUIVendorServiceComponent</item>
<item>com.android.systemui.util.leak.GarbageMonitor$Service</item> <item>com.android.systemui.util.leak.GarbageMonitor$Service</item>
<item>com.android.systemui.LatencyTester</item> <!-- <item>com.android.systemui.LatencyTester</item>-->
<item>com.android.systemui.globalactions.GlobalActionsComponent</item> <!-- <item>com.android.systemui.globalactions.GlobalActionsComponent</item>-->
<item>com.android.systemui.ScreenDecorations</item> <item>com.android.systemui.ScreenDecorations</item>
<item>com.android.systemui.biometrics.AuthController</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.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.theme.ThemeOverlayController</item>
<item>com.android.systemui.navigationbar.car.CarNavigationBar</item> <item>com.android.systemui.navigationbar.car.CarNavigationBar</item>
<item>com.android.systemui.toast.ToastUI</item> <item>com.android.systemui.toast.ToastUI</item>

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

@@ -52,7 +52,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.AutoHideUiElement; import com.android.systemui.statusbar.AutoHideUiElement;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NavigationBarController; 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.AutoHideController;
import com.android.systemui.statusbar.phone.BarTransitions; import com.android.systemui.statusbar.phone.BarTransitions;
import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy; 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 Handler mMainHandler;
private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy; private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;
private final Lazy<NavigationBarController> mNavigationBarControllerLazy; private final Lazy<NavigationBarController> mNavigationBarControllerLazy;
private final SuperStatusBarViewFactory mSuperStatusBarViewFactory;
private final ButtonSelectionStateController mButtonSelectionStateController; private final ButtonSelectionStateController mButtonSelectionStateController;
private final PhoneStatusBarPolicy mIconPolicy; private final PhoneStatusBarPolicy mIconPolicy;
private final StatusBarIconController mIconController; private final StatusBarIconController mIconController;
@@ -127,7 +125,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
@Main Handler mainHandler, @Main Handler mainHandler,
Lazy<KeyguardStateController> keyguardStateControllerLazy, Lazy<KeyguardStateController> keyguardStateControllerLazy,
Lazy<NavigationBarController> navigationBarControllerLazy, Lazy<NavigationBarController> navigationBarControllerLazy,
SuperStatusBarViewFactory superStatusBarViewFactory,
ButtonSelectionStateController buttonSelectionStateController, ButtonSelectionStateController buttonSelectionStateController,
PhoneStatusBarPolicy iconPolicy, PhoneStatusBarPolicy iconPolicy,
StatusBarIconController iconController StatusBarIconController iconController
@@ -143,7 +140,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
mMainHandler = mainHandler; mMainHandler = mainHandler;
mKeyguardStateControllerLazy = keyguardStateControllerLazy; mKeyguardStateControllerLazy = keyguardStateControllerLazy;
mNavigationBarControllerLazy = navigationBarControllerLazy; mNavigationBarControllerLazy = navigationBarControllerLazy;
mSuperStatusBarViewFactory = superStatusBarViewFactory;
mButtonSelectionStateController = buttonSelectionStateController; mButtonSelectionStateController = buttonSelectionStateController;
mIconPolicy = iconPolicy; mIconPolicy = iconPolicy;
mIconController = iconController; mIconController = iconController;

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

@@ -38,7 +38,6 @@ import com.android.systemui.SysuiTestCase;
import com.android.systemui.car.CarDeviceProvisionedController; import com.android.systemui.car.CarDeviceProvisionedController;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NavigationBarController; 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.AutoHideController;
import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy; import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -75,8 +74,6 @@ public class CarNavigationBarTest extends SysuiTestCase {
@Mock @Mock
private NavigationBarController mNavigationBarController; private NavigationBarController mNavigationBarController;
@Mock @Mock
private SuperStatusBarViewFactory mSuperStatusBarViewFactory;
@Mock
private ButtonSelectionStateController mButtonSelectionStateController; private ButtonSelectionStateController mButtonSelectionStateController;
@Mock @Mock
private PhoneStatusBarPolicy mIconPolicy; private PhoneStatusBarPolicy mIconPolicy;
@@ -92,8 +89,7 @@ public class CarNavigationBarTest extends SysuiTestCase {
mCarNavigationBarController, mWindowManager, mDeviceProvisionedController, mCarNavigationBarController, mWindowManager, mDeviceProvisionedController,
new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener, new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener,
mHandler, () -> mKeyguardStateController, () -> mNavigationBarController, mHandler, () -> mKeyguardStateController, () -> mNavigationBarController,
mSuperStatusBarViewFactory, mButtonSelectionStateController, mIconPolicy, mButtonSelectionStateController, mIconPolicy, mIconController);
mIconController);
} }
@Test @Test