Merge "Minor refactoring to support moving code to shell" (a4d446fd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -124,8 +124,8 @@ import com.android.systemui.util.leak.GarbageMonitor;
		import com.android.systemui.util.leak.LeakDetector;
		import com.android.systemui.util.leak.LeakReporter;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		import com.android.systemui.wm.DisplayController;
		import com.android.systemui.wm.DisplayImeController;
		import com.android.systemui.wm.DisplayWindowController;
		import com.android.systemui.wm.SystemWindows;

		import java.io.FileDescriptor;
		@@ -324,7 +324,7 @@ public class Dependency {
		@Inject Lazy<CommandQueue> mCommandQueue;
		@Inject Lazy<Recents> mRecents;
		@Inject Lazy<StatusBar> mStatusBar;
		@Inject Lazy<DisplayWindowController> mDisplayWindowController;
		@Inject Lazy<DisplayController> mDisplayController;
		@Inject Lazy<SystemWindows> mSystemWindows;
		@Inject Lazy<DisplayImeController> mDisplayImeController;
		@Inject Lazy<RecordingController> mRecordingController;
		@@ -518,7 +518,7 @@ public class Dependency {
		mProviders.put(CommandQueue.class, mCommandQueue::get);
		mProviders.put(Recents.class, mRecents::get);
		mProviders.put(StatusBar.class, mStatusBar::get);
		mProviders.put(DisplayWindowController.class, mDisplayWindowController::get);
		mProviders.put(DisplayController.class, mDisplayController::get);
		mProviders.put(SystemWindows.class, mSystemWindows::get);
		mProviders.put(DisplayImeController.class, mDisplayImeController::get);
		mProviders.put(ProtoTracer.class, mProtoTracer::get);

packages/SystemUI/src/com/android/systemui/pip/BasePipManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,13 +20,13 @@ import android.content.Context;
		import android.content.res.Configuration;

		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.wm.DisplayWindowController;
		import com.android.systemui.wm.DisplayController;

		import java.io.PrintWriter;

		public interface BasePipManager {
		void initialize(Context context, BroadcastDispatcher broadcastDispatcher,
		DisplayWindowController displayWindowController);
		DisplayController displayController);
		void showPictureInPictureMenu();
		default void expandPip() {}
		default void hidePipMenu(Runnable onStartCallback, Runnable onEndCallback) {}

packages/SystemUI/src/com/android/systemui/pip/PipUI.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.os.UserManager;
		import com.android.systemui.SystemUI;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.wm.DisplayWindowController;
		import com.android.systemui.wm.DisplayController;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -45,17 +45,17 @@ public class PipUI extends SystemUI implements CommandQueue.Callbacks {
		private final CommandQueue mCommandQueue;
		private BasePipManager mPipManager;
		private final BroadcastDispatcher mBroadcastDispatcher;
		private final DisplayWindowController mDisplayWindowController;
		private final DisplayController mDisplayController;
		private boolean mSupportsPip;

		@Inject
		public PipUI(Context context, CommandQueue commandQueue,
		BroadcastDispatcher broadcastDispatcher,
		DisplayWindowController displayWindowController) {
		DisplayController displayController) {
		super(context);
		mBroadcastDispatcher = broadcastDispatcher;
		mCommandQueue = commandQueue;
		mDisplayWindowController = displayWindowController;
		mDisplayController = displayController;
		}

		@Override
		@@ -75,7 +75,7 @@ public class PipUI extends SystemUI implements CommandQueue.Callbacks {
		mPipManager = pm.hasSystemFeature(FEATURE_LEANBACK_ONLY)
		? com.android.systemui.pip.tv.PipManager.getInstance()
		: com.android.systemui.pip.phone.PipManager.getInstance();
		mPipManager.initialize(mContext, mBroadcastDispatcher, mDisplayWindowController);
		mPipManager.initialize(mContext, mBroadcastDispatcher, mDisplayController);

		mCommandQueue.addCallback(this);
		}

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -46,7 +46,8 @@ import com.android.systemui.shared.system.InputConsumerController;
		import com.android.systemui.shared.system.PinnedStackListenerForwarder.PinnedStackListener;
		import com.android.systemui.shared.system.TaskStackChangeListener;
		import com.android.systemui.shared.system.WindowManagerWrapper;
		import com.android.systemui.wm.DisplayWindowController;
		import com.android.systemui.wm.DisplayChangeController;
		import com.android.systemui.wm.DisplayController;

		import java.io.PrintWriter;

		@@ -79,7 +80,7 @@ public class PipManager implements BasePipManager {
		/**
		* Handler for display rotation changes.
		*/
		private final DisplayWindowController.OnDisplayWindowRotationController mRotationController = (
		private final DisplayChangeController.OnDisplayChangingListener mRotationController = (
		int displayId, int fromRotation, int toRotation, WindowContainerTransaction t) -> {
		final boolean changed = mPipBoundsHandler.onDisplayRotationChanged(mTmpNormalBounds,
		displayId, fromRotation, toRotation, t);
		@@ -230,7 +231,7 @@ public class PipManager implements BasePipManager {
		* Initializes {@link PipManager}.
		*/
		public void initialize(Context context, BroadcastDispatcher broadcastDispatcher,
		DisplayWindowController displayWindowController) {
		DisplayController displayController) {
		mContext = context;
		mActivityManager = ActivityManager.getService();
		mActivityTaskManager = ActivityTaskManager.getService();
		@@ -251,7 +252,7 @@ public class PipManager implements BasePipManager {
		mMenuController, mInputConsumerController, mPipBoundsHandler);
		mAppOpsListener = new PipAppOpsListener(context, mActivityManager,
		mTouchHandler.getMotionHelper());
		displayWindowController.addRotationController(mRotationController);
		displayController.addDisplayChangingController(mRotationController);

		// If SystemUI restart, and it already existed a pinned stack,
		// register the pip input consumer to ensure touch can send to it.

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.PinnedStackListenerForwarder.PinnedStackListener;
		import com.android.systemui.shared.system.TaskStackChangeListener;
		import com.android.systemui.shared.system.WindowManagerWrapper;
		import com.android.systemui.wm.DisplayWindowController;
		import com.android.systemui.wm.DisplayController;

		import java.util.ArrayList;
		import java.util.List;
		@@ -230,7 +230,7 @@ public class PipManager implements BasePipManager {
		* Initializes {@link PipManager}.
		*/
		public void initialize(Context context, BroadcastDispatcher broadcastDispatcher,
		DisplayWindowController displayWindowController) {
		DisplayController displayController) {
		if (mInitialized) {
		return;
		}