Snap for 5753328 from 8052a9b958cabfb683905f4c4c14d91df02e807f to qt-c2f2-release (986f1126) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -5437,10 +5437,11 @@ public class Notification implements Parcelable
		/**
		* Construct a RemoteViews for the display in public contexts like on the lockscreen.
		*
		* @param isLowPriority is this notification low priority
		* @hide
		*/
		@UnsupportedAppUsage
		public RemoteViews makePublicContentView() {
		public RemoteViews makePublicContentView(boolean isLowPriority) {
		if (mN.publicVersion != null) {
		final Builder builder = recoverBuilder(mContext, mN.publicVersion);
		return builder.createContentView();
		@@ -5467,7 +5468,11 @@ public class Notification implements Parcelable
		}
		mN.extras = publicExtras;
		RemoteViews view;
		view = makeNotificationHeader();
		StandardTemplateParams params = mParams.reset().fillTextsFrom(this);
		if (isLowPriority) {
		params.forceDefaultColor();
		}
		view = makeNotificationHeader(params);
		view.setBoolean(R.id.notification_header, "setExpandOnlyOnButton", true);
		mN.extras = savedBundle;
		mN.mLargeIcon = largeIcon;

core/java/android/view/IRecentsAnimationController.aidl

+30 −14

Original line number	Diff line number	Diff line
		@@ -76,6 +76,21 @@ interface IRecentsAnimationController {
		*/
		void hideCurrentInputMethod();

		/**
		* This call is deprecated, use #setDeferCancelUntilNextTransition() instead
		* TODO(138144750): Remove this method once there are no callers
		* @deprecated
		*/
		void setCancelWithDeferredScreenshot(boolean screenshot);

		/**
		* Clean up the screenshot of previous task which was created during recents animation that
		* was cancelled by a stack order change.
		*
		* @see {@link IRecentsAnimationRunner#onAnimationCanceled}
		*/
		void cleanupScreenshot();

		/**
		* Set a state for controller whether would like to cancel recents animations with deferred
		* task screenshot presentation.
		@@ -86,22 +101,23 @@ interface IRecentsAnimationController {
		* screenshot, so that Launcher can still control the leash lifecycle & make the next app
		* transition animate smoothly without flickering.
		*
		* @param screenshot When set {@code true}, means recents animation will be canceled when the
		* next app launch. System will take previous task's screenshot when the next
		* app transition starting, and skip previous task's animation.
		* Set {@code false} means will not take screenshot & skip animation
		* for previous task.
		* @param defer When set {@code true}, means that the recents animation will defer canceling the
		* animation when a stack order change is triggered until the subsequent app
		* transition start and skip previous task's animation.
		* When set to {@code false}, means that the recents animation will be canceled
		* immediately when the stack order changes.
		* @param screenshot When set {@code true}, means that the system will take previous task's
		* screenshot and replace the contents of the leash with it when the next app
		* transition starting. The runner must call #cleanupScreenshot() to end the
		* recents animation.
		* When set to {@code false}, means that the system will simply wait for the
		* next app transition start to immediately cancel the recents animation. This
		* can be useful when you want an immediate transition into a state where the
		* task is shown in the home/recents activity (without waiting for a
		* screenshot).
		*
		* @see #cleanupScreenshot()
		* @see IRecentsAnimationRunner#onCancelled
		*/
		void setCancelWithDeferredScreenshot(boolean screenshot);

		/**
		* Clean up the screenshot of previous task which was created during recents animation that
		* was cancelled by a stack order change.
		*
		* @see {@link IRecentsAnimationRunner#onAnimationCanceled}
		*/
		void cleanupScreenshot();
		void setDeferCancelUntilNextTransition(boolean defer, boolean screenshot);
		}

core/java/android/view/IRecentsAnimationRunner.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ oneway interface IRecentsAnimationRunner {
		* @param deferredWithScreenshot If set to {@code true}, the contents of the task will be
		* replaced with a screenshot, such that the runner's leash is
		* still active. As soon as the runner doesn't need the leash
		* anymore, it can call
		* anymore, it must call
		* {@link IRecentsAnimationController#cleanupScreenshot).
		*
		* @see {@link RecentsAnimationController#cleanupScreenshot}

core/java/android/view/View.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -967,6 +967,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		static boolean sBrokenInsetsDispatch;

		/**
		* Prior to Q, calling
		* {@link com.android.internal.policy.DecorView#setBackgroundDrawable(Drawable)}
		* did not call update the window format so the opacity of the background was not correctly
		* applied to the window. Some applications rely on this misbehavior to work properly.
		* <p>
		* From Q, {@link com.android.internal.policy.DecorView#setBackgroundDrawable(Drawable)} is
		* the same as {@link com.android.internal.policy.DecorView#setWindowBackground(Drawable)}
		* which updates the window format.
		* @hide
		*/
		protected static boolean sBrokenWindowBackground;

		/** @hide */
		@IntDef({NOT_FOCUSABLE, FOCUSABLE, FOCUSABLE_AUTO})
		@Retention(RetentionPolicy.SOURCE)
		@@ -5223,6 +5236,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		sBrokenInsetsDispatch = ViewRootImpl.sNewInsetsMode != NEW_INSETS_MODE_FULL
		\|\| targetSdkVersion < Build.VERSION_CODES.Q;

		sBrokenWindowBackground = targetSdkVersion < Build.VERSION_CODES.Q;

		sCompatibilityDone = true;
		}
		}

core/java/com/android/internal/policy/DecorView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -983,15 +983,16 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind

		@Override
		public void setBackgroundDrawable(Drawable background) {

		// TODO: This should route through setWindowBackground, but late in the release to make this
		// change.
		if (mOriginalBackgroundDrawable != background) {
		mOriginalBackgroundDrawable = background;
		updateBackgroundDrawable();
		if (!View.sBrokenWindowBackground) {
		drawableChanged();
		}
		}
		}

		public void setWindowFrame(Drawable drawable) {
		if (getForeground() != drawable) {