Snap for 9121707 from ff008f07472cde6783e24a357a2506429ad13b83 to tm-qpr1-release (5a4b612d) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -4453,6 +4453,10 @@ public class Notification implements Parcelable
		* <p>Apps targeting {@link Build.VERSION_CODES#Q} and above will have to request
		* a permission ({@link android.Manifest.permission#USE_FULL_SCREEN_INTENT}) in order to
		* use full screen intents.</p>
		* <p>
		* To be launched as a full screen intent, the notification must also be posted to a
		* channel with importance level set to IMPORTANCE_HIGH or higher.
		* </p>
		*
		* @param intent The pending intent to launch.
		* @param highPriority Passing true will cause this notification to be sent

core/java/android/hardware/camera2/params/OutputConfiguration.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -159,8 +159,9 @@ public final class OutputConfiguration implements Parcelable {
		*
		* <li> For a SurfaceView output surface, the timestamp base is {@link
		* #TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED}. The timestamp is overridden with choreographer
		* pulses from the display subsystem for smoother display of camera frames. The timestamp
		* is roughly in the same time base as {@link android.os.SystemClock#uptimeMillis}.</li>
		* pulses from the display subsystem for smoother display of camera frames when the camera
		* device runs in fixed frame rate. The timestamp is roughly in the same time base as
		* {@link android.os.SystemClock#uptimeMillis}.</li>
		* <li> For an output surface of MediaRecorder, MediaCodec, or ImageReader with {@link
		* android.hardware.HardwareBuffer#USAGE_VIDEO_ENCODE} usge flag, the timestamp base is
		* {@link #TIMESTAMP_BASE_MONOTONIC}, which is roughly the same time base as
		@@ -231,7 +232,8 @@ public final class OutputConfiguration implements Parcelable {
		*
		* <p>The timestamp of the output images are overridden with choreographer pulses from the
		* display subsystem for smoother display of camera frames. An output target of SurfaceView
		* uses this time base by default.</p>
		* uses this time base by default. Note that the timestamp override is done for fixed camera
		* frame rate only.</p>
		*
		* <p>This timestamp base isn't applicable to SurfaceTexture targets. SurfaceTexture's
		* {@link android.graphics.SurfaceTexture#updateTexImage updateTexImage} function always

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -188,14 +188,16 @@ public abstract class WMShellModule {
		@ShellMainThread Choreographer mainChoreographer,
		ShellTaskOrganizer taskOrganizer,
		DisplayController displayController,
		SyncTransactionQueue syncQueue) {
		SyncTransactionQueue syncQueue,
		@DynamicOverride DesktopModeController desktopModeController) {
		return new CaptionWindowDecorViewModel(
		context,
		mainHandler,
		mainChoreographer,
		taskOrganizer,
		displayController,
		syncQueue);
		syncQueue,
		desktopModeController);
		}

		//
		@@ -318,6 +320,7 @@ public abstract class WMShellModule {
		ShellCommandHandler shellCommandHandler,
		ShellController shellController,
		DisplayController displayController,
		PipAnimationController pipAnimationController,
		PipAppOpsListener pipAppOpsListener,
		PipBoundsAlgorithm pipBoundsAlgorithm,
		PhonePipKeepClearAlgorithm pipKeepClearAlgorithm,
		@@ -337,11 +340,12 @@ public abstract class WMShellModule {
		@ShellMainThread ShellExecutor mainExecutor) {
		return Optional.ofNullable(PipController.create(
		context, shellInit, shellCommandHandler, shellController,
		displayController, pipAppOpsListener, pipBoundsAlgorithm, pipKeepClearAlgorithm,
		pipBoundsState, pipMotionHelper, pipMediaController, phonePipMenuController,
		pipTaskOrganizer, pipTransitionState, pipTouchHandler, pipTransitionController,
		windowManagerShellWrapper, taskStackListener, pipParamsChangedForwarder,
		displayInsetsController, oneHandedController, mainExecutor));
		displayController, pipAnimationController, pipAppOpsListener, pipBoundsAlgorithm,
		pipKeepClearAlgorithm, pipBoundsState, pipMotionHelper, pipMediaController,
		phonePipMenuController, pipTaskOrganizer, pipTransitionState, pipTouchHandler,
		pipTransitionController, windowManagerShellWrapper, taskStackListener,
		pipParamsChangedForwarder, displayInsetsController, oneHandedController,
		mainExecutor));
		}

		@WMSingleton

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,25 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll
		mShellTaskOrganizer.applyTransaction(wct);
		}

		/**
		* Turn desktop mode on or off
		* @param active the desired state for desktop mode setting
		*/
		public void setDesktopModeActive(boolean active) {
		int value = active ? 1 : 0;
		Settings.System.putInt(mContext.getContentResolver(), Settings.System.DESKTOP_MODE, value);
		}

		/**
		* Returns the windowing mode of the display area with the specified displayId.
		* @param displayId
		* @return
		*/
		public int getDisplayAreaWindowingMode(int displayId) {
		return mRootTaskDisplayAreaOrganizer.getDisplayAreaInfo(displayId)
		.configuration.windowConfiguration.getWindowingMode();
		}

		/**
		* A {@link ContentObserver} for listening to changes to {@link Settings.System#DESKTOP_MODE}
		*/

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,17 @@ public class PipAnimationController {
		return animator;
		}

		/**
		* Returns true if the PiP window is currently being animated.
		*/
		public boolean isAnimating() {
		PipAnimationController.PipTransitionAnimator animator = getCurrentAnimator();
		if (animator != null && animator.isRunning()) {
		return true;
		}
		return false;
		}

		/**
		* Quietly cancel the animator by removing the listeners first.
		*/