Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev (a9dddfb0) · Commits · e / os / android_frameworks_base

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -1929,9 +1929,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		: null;

		// Reapply the RemoteViews
		if (entry.row != null) {
		entry.row.resetHeight();
		}
		contentView.reapply(mContext, entry.expanded, mOnClickHandler);
		if (bigContentView != null && entry.getBigContentView() != null) {
		bigContentView.reapply(mContext, entry.getBigContentView(),
		@@ -1950,6 +1947,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		entry.row.setOnClickListener(null);
		}
		entry.row.notifyContentUpdated();
		entry.row.resetHeight();
		}

		protected void notifyHeadsUpScreenOn(boolean screenOn) {

+7 −1

Original line number	Diff line number	Diff line
		@@ -1547,7 +1547,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		mStackScrollAlgorithm.notifyChildrenChanged(this);
		((ExpandableView) child).setOnHeightChangedListener(this);
		generateAddAnimation(child, false /* fromMoreCard */);
		updateAnimationState(mAnimationsEnabled && mIsExpanded, child);
		updateAnimationState(child);
		}

		public void setAnimationsEnabled(boolean animationsEnabled) {
		@@ -1564,6 +1564,11 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		}

		private void updateAnimationState(View child) {
		updateAnimationState(mAnimationsEnabled && mIsExpanded, child);
		}


		private void updateAnimationState(boolean running, View child) {
		if (child instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) child;
		@@ -1961,6 +1966,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		mRequestViewResizeAnimationOnLayout = true;
		}
		mStackScrollAlgorithm.onReset(view);
		updateAnimationState(view);
		}

		private void updateScrollPositionOnExpandInBottom(ExpandableView view) {