Merge "Avoid weird expand animation when a notification is updated am:... (215c8c66) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		int intrinsicHeight = getIntrinsicHeight();
		mIsPinned = pinned;
		if (intrinsicHeight != getIntrinsicHeight()) {
		notifyHeightChanged(false);
		notifyHeightChanged(false /* needsAnimation */);
		}
		if (pinned) {
		setIconAnimationRunning(true);
		@@ -840,8 +840,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		}

		public void resetHeight() {
		mMaxExpandHeight = 0;
		mHeadsUpHeight = 0;
		onHeightReset();
		requestLayout();
		}
		@@ -1290,7 +1288,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		}
		mHeadsUpHeight = headsUpChild.getHeight();
		if (intrinsicBefore != getIntrinsicHeight()) {
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(true /* needsAnimation */);
		}
		}

		@@ -1398,7 +1396,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		if (isChildInGroup()) {
		mGroupManager.setGroupExpanded(mStatusBarNotification, true);
		}
		notifyHeightChanged(false);
		notifyHeightChanged(false /* needsAnimation */);
		}

		public void setChildrenExpanded(boolean expanded, boolean animate) {

+0 −8

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		private float mTopPaddingOverflow;
		private boolean mDontReportNextOverScroll;
		private boolean mDontClampNextScroll;
		private boolean mRequestViewResizeAnimationOnLayout;
		private boolean mNeedViewResizeAnimation;
		private View mExpandedGroupView;
		private boolean mEverythingNeedsAnimation;
		@@ -519,10 +518,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		setMaxLayoutHeight(getHeight());
		updateContentHeight();
		clampScrollPosition();
		if (mRequestViewResizeAnimationOnLayout) {
		requestAnimationOnViewResize(null);
		mRequestViewResizeAnimationOnLayout = false;
		}
		requestChildrenUpdate();
		updateFirstAndLastBackgroundViews();
		}
		@@ -3144,9 +3139,6 @@ public class NotificationStackScrollLayout extends ViewGroup

		@Override
		public void onReset(ExpandableView view) {
		if (mIsExpanded && mAnimationsEnabled) {
		mRequestViewResizeAnimationOnLayout = true;
		}
		updateAnimationState(view);
		updateChronometerForChild(view);
		}