Snap for 7775214 from be0bdf6178e8084b928f8bd98ce3e0a1a53dd3d9 to sc-qpr1-release (92ae3818) · Commits · e / os / android_frameworks_base

core/java/android/view/animation/Animation.java

+7 −14

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.view.animation;
		import android.annotation.AnimRes;
		import android.annotation.ColorInt;
		import android.annotation.InterpolatorRes;
		import android.app.ActivityThread;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.content.res.TypedArray;
		@@ -259,6 +258,8 @@ public abstract class Animation implements Cloneable {

		setZAdjustment(a.getInt(com.android.internal.R.styleable.Animation_zAdjustment, ZORDER_NORMAL));

		setBackgroundColor(a.getInt(com.android.internal.R.styleable.Animation_background, 0));

		setDetachWallpaper(
		a.getBoolean(com.android.internal.R.styleable.Animation_detachWallpaper, false));
		setShowWallpaper(
		@@ -270,15 +271,6 @@ public abstract class Animation implements Cloneable {

		a.recycle();

		Context uiContext = ActivityThread.currentActivityThread().getSystemUiContext();
		TypedArray uiStyledAttrs = uiContext
		.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Animation);

		setBackgroundColor(
		uiStyledAttrs.getColor(com.android.internal.R.styleable.Animation_background, 0));

		uiStyledAttrs.recycle();

		if (resID > 0) {
		setInterpolator(context, resID);
		}
		@@ -640,15 +632,16 @@ public abstract class Animation implements Cloneable {
		}

		/**
		* Set background behind an animation.
		* Set background behind animation.
		*
		* @param bg The background color. If 0, no background.
		* @param bg The background color. If 0, no background. Currently must
		* be black, with any desired alpha level.
		*
		* @deprecated None of window animations are running with background color.
		*/
		@Deprecated
		public void setBackgroundColor(@ColorInt int bg) {
		mBackgroundColor = bg;
		// The background color is not needed any more, do nothing.
		}

		/**
		@@ -810,7 +803,7 @@ public abstract class Animation implements Cloneable {
		@Deprecated
		@ColorInt
		public int getBackgroundColor() {
		return mBackgroundColor;
		return 0;
		}

		/**

core/res/res/values/attrs.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -6822,8 +6822,9 @@
		content for the duration of the animation. -->
		<enum name="bottom" value="-1" />
		</attr>
		<!-- Special background behind animation. Only for use with task animations.
		If 0, the default, there is no background. -->
		<!-- Special background behind animation. Only for use with window
		animations. Can only be a color, and only black. If 0, the
		default, there is no background. -->
		<attr name="background" />
		<!-- Special option for window animations: if this window is on top
		of a wallpaper, don't animate the wallpaper with it. -->

libs/hwui/pipeline/skia/RenderNodeDrawable.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -243,13 +243,12 @@ void RenderNodeDrawable::drawContent(SkCanvas* canvas) const {
		// the corresponding SkImageFilter each time.
		// See b/193145089 and b/197263715
		if (!Properties::enableRenderEffectCache) {
		snapshotImage = renderNode->getLayerSurface()->makeImageSnapshot();
		if (imageFilter) {
		auto subset = SkIRect::MakeWH(srcBounds.width(), srcBounds.height());
		snapshotImage = snapshotImage->makeWithFilter(recordingContext, imageFilter,
		subset, clipBounds.roundOut(),
		&srcBounds, &offset);
		} else {
		snapshotImage = renderNode->getLayerSurface()->makeImageSnapshot();
		}
		} else {
		const auto snapshotResult = renderNode->updateSnapshotIfRequired(

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ public class KeyguardIndicationController {
		info = mLockPatternUtils.getOwnerInfo(KeyguardUpdateMonitor.getCurrentUser());
		}
		}
		if (info != null) {
		if (!TextUtils.isEmpty(info)) {
		mRotateTextViewController.updateIndication(
		INDICATION_TYPE_OWNER_INFO,
		new KeyguardIndication.Builder()
		@@ -433,7 +433,7 @@ public class KeyguardIndicationController {
		}

		private void updateResting() {
		if (mRestingIndication != null
		if (!TextUtils.isEmpty(mRestingIndication)
		&& !mRotateTextViewController.hasIndications()) {
		mRotateTextViewController.updateIndication(
		INDICATION_TYPE_RESTING,

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -104,7 +104,16 @@ class OngoingCallController @Inject constructor(
		}
		}

		// Fix for b/199600334
		override fun onEntryCleanUp(entry: NotificationEntry) {
		removeChipIfNeeded(entry)
		}

		override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {
		removeChipIfNeeded(entry)
		}

		private fun removeChipIfNeeded(entry: NotificationEntry) {
		if (entry.sbn.key == callNotificationInfo?.key) {
		removeChip()
		}