Merge "Fix sysui gradle build" (7a690bc5) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -262,11 +262,11 @@ public class PipTaskOrganizer extends TaskOrganizer implements ShellTaskOrganize

		if (!PipUtils.hasSystemFeature(context)) {
		Log.w(TAG, "Device not support PIP feature");
		return;
		}
		} else {
		mTaskOrganizer.addListener(this, WINDOWING_MODE_PINNED);
		displayController.addDisplayWindowListener(this);
		}
		}

		public Handler getUpdateHandler() {
		return mUpdateHandler;

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

+32 −35

Original line number	Diff line number	Diff line
		@@ -219,16 +219,13 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
		PipTaskOrganizer pipTaskOrganizer,
		WindowManagerShellWrapper windowManagerShellWrapper
		) {
		if (mInitialized) {
		return;
		}

		if (!mInitialized) {
		mInitialized = true;
		mContext = context;
		mPipNotification = new PipNotification(context, this);
		mPipBoundsHandler = pipBoundsHandler;
		// Ensure that we have the display info in case we get calls to update the bounds before the
		// listener calls back
		// Ensure that we have the display info in case we get calls to update the bounds
		// before the listener calls back
		final DisplayInfo displayInfo = new DisplayInfo();
		context.getDisplay().getDisplayInfo(displayInfo);
		mPipBoundsHandler.onDisplayInfoChanged(displayInfo);
		@@ -247,8 +244,7 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
		mLastOrientation = initialConfig.orientation;
		loadConfigurationsAndApply(initialConfig);

		mMediaSessionManager =
		(MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);
		mMediaSessionManager = mContext.getSystemService(MediaSessionManager.class);
		mWindowManagerShellWrapper = windowManagerShellWrapper;
		try {
		mWindowManagerShellWrapper.addPinnedStackListener(mPinnedStackListener);
		@@ -256,6 +252,7 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
		Log.e(TAG, "Failed to register pinned stack listener", e);
		}
		}
		}

		private void loadConfigurationsAndApply(Configuration newConfig) {
		if (mLastOrientation != newConfig.orientation) {