Merge "Use mock window manager for BubbleController in tests" into rvc-dev am:... (0f067435) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+3 −27

Original line number	Diff line number	Diff line
		@@ -280,31 +280,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		}
		}

		public BubbleController(Context context,
		NotificationShadeWindowController notificationShadeWindowController,
		StatusBarStateController statusBarStateController,
		ShadeController shadeController,
		BubbleData data,
		ConfigurationController configurationController,
		NotificationInterruptStateProvider interruptionStateProvider,
		ZenModeController zenModeController,
		NotificationLockscreenUserManager notifUserManager,
		NotificationGroupManager groupManager,
		NotificationEntryManager entryManager,
		NotifPipeline notifPipeline,
		FeatureFlags featureFlags,
		DumpManager dumpManager,
		FloatingContentCoordinator floatingContentCoordinator,
		BubbleDataRepository dataRepository,
		SysUiState sysUiState,
		INotificationManager notificationManager) {
		this(context, notificationShadeWindowController, statusBarStateController, shadeController,
		data, null /* synchronizer */, configurationController, interruptionStateProvider,
		zenModeController, notifUserManager, groupManager, entryManager,
		notifPipeline, featureFlags, dumpManager, floatingContentCoordinator,
		dataRepository, sysUiState, notificationManager);
		}

		/**
		* Injected constructor. See {@link BubbleModule}.
		*/
		@@ -326,7 +301,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		FloatingContentCoordinator floatingContentCoordinator,
		BubbleDataRepository dataRepository,
		SysUiState sysUiState,
		INotificationManager notificationManager) {
		INotificationManager notificationManager,
		WindowManager windowManager) {
		dumpManager.registerDumpable(TAG, this);
		mContext = context;
		mShadeController = shadeController;
		@@ -395,7 +371,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		}
		mSurfaceSynchronizer = synchronizer;

		mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
		mWindowManager = windowManager;
		mBarService = IStatusBarService.Stub.asInterface(
		ServiceManager.getService(Context.STATUS_BAR_SERVICE));

packages/SystemUI/src/com/android/systemui/bubbles/dagger/BubbleModule.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.bubbles.dagger;

		import android.app.INotificationManager;
		import android.content.Context;
		import android.view.WindowManager;

		import com.android.systemui.bubbles.BubbleController;
		import com.android.systemui.bubbles.BubbleData;
		@@ -68,7 +69,8 @@ public interface BubbleModule {
		FloatingContentCoordinator floatingContentCoordinator,
		BubbleDataRepository bubbleDataRepository,
		SysUiState sysUiState,
		INotificationManager notifManager) {
		INotificationManager notifManager,
		WindowManager windowManager) {
		return new BubbleController(
		context,
		notificationShadeWindowController,
		@@ -88,6 +90,7 @@ public interface BubbleModule {
		floatingContentCoordinator,
		bubbleDataRepository,
		sysUiState,
		notifManager);
		notifManager,
		windowManager);
		}
		}

packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,8 @@ public class BubbleControllerTest extends SysuiTestCase {
		mFloatingContentCoordinator,
		mDataRepository,
		mSysUiState,
		mock(INotificationManager.class));
		mock(INotificationManager.class),
		mWindowManager);
		mBubbleController.setExpandListener(mBubbleExpandListener);

		// Get a reference to the BubbleController's entry listener

packages/SystemUI/tests/src/com/android/systemui/bubbles/NewNotifPipelineBubbleControllerTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,8 @@ public class NewNotifPipelineBubbleControllerTest extends SysuiTestCase {
		mFloatingContentCoordinator,
		mDataRepository,
		mSysUiState,
		mock(INotificationManager.class));
		mock(INotificationManager.class),
		mWindowManager);
		mBubbleController.addNotifCallback(mNotifCallback);
		mBubbleController.setExpandListener(mBubbleExpandListener);

packages/SystemUI/tests/src/com/android/systemui/bubbles/TestableBubbleController.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.bubbles;

		import android.app.INotificationManager;
		import android.content.Context;
		import android.view.WindowManager;

		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.model.SysUiState;
		@@ -57,13 +58,15 @@ public class TestableBubbleController extends BubbleController {
		FloatingContentCoordinator floatingContentCoordinator,
		BubbleDataRepository dataRepository,
		SysUiState sysUiState,
		INotificationManager notificationManager) {
		INotificationManager notificationManager,
		WindowManager windowManager) {
		super(context,
		notificationShadeWindowController, statusBarStateController, shadeController,
		data, Runnable::run, configurationController, interruptionStateProvider,
		zenModeController, lockscreenUserManager, groupManager, entryManager,
		notifPipeline, featureFlags, dumpManager, floatingContentCoordinator,
		dataRepository, sysUiState, notificationManager);
		dataRepository, sysUiState, notificationManager,
		windowManager);
		setInflateSynchronously(true);
		}
		}