Merge "Remove unused AnimationFilter.animateYViews" into main (08e705aa) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AnimationFilter.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ public class AnimationFilter {
		boolean animateAlpha;
		boolean animateX;
		public boolean animateY;
		ArraySet<View> animateYViews = new ArraySet<>();
		boolean animateZ;
		boolean animateHeight;
		boolean animateTopInset;
		@@ -87,13 +86,8 @@ public class AnimationFilter {
		return this;
		}

		public AnimationFilter animateY(View view) {
		animateYViews.add(view);
		return this;
		}

		public boolean shouldAnimateY(View view) {
		return animateY \|\| animateYViews.contains(view);
		return animateY;
		}

		/**
		@@ -118,7 +112,6 @@ public class AnimationFilter {
		animateAlpha \|= filter.animateAlpha;
		animateX \|= filter.animateX;
		animateY \|= filter.animateY;
		animateYViews.addAll(filter.animateYViews);
		animateZ \|= filter.animateZ;
		animateHeight \|= filter.animateHeight;
		animateTopInset \|= filter.animateTopInset;
		@@ -131,7 +124,6 @@ public class AnimationFilter {
		animateAlpha = false;
		animateX = false;
		animateY = false;
		animateYViews.clear();
		animateZ = false;
		animateHeight = false;
		animateTopInset = false;

+1 −1

Original line number	Diff line number	Diff line
		@@ -657,7 +657,7 @@ public class ViewState implements Dumpable {
		}
		ObjectAnimator previousAnimator = getChildTag(child, TAG_ANIMATOR_TRANSLATION_Y);
		AnimationFilter filter = properties.getAnimationFilter();
		if (!filter.shouldAnimateY(child)) {
		if (!filter.animateY) {
		// just a local update was performed
		if (previousAnimator != null) {
		// we need to increase all animation keyframes of the previous animator by the