Merge "Fixed that the icon could dissappear" into oc-dev (58b39a1f) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -434,7 +434,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
		iconState.scaleY = 1.0f;
		iconState.hidden = false;
		}
		if (row.isAboveShelf() \|\| (!row.isInShelf() && isLastChild && row.areGutsExposed())) {
		if (row.isAboveShelf() \|\| (!row.isInShelf() && (isLastChild && row.areGutsExposed()
		\|\| row.getTranslationZ() > mAmbientState.getBaseZHeight()))) {
		iconState.hidden = true;
		}
		int shelfColor = icon.getStaticDrawableColor();

+3 −2

Original line number	Diff line number	Diff line
		@@ -190,7 +190,9 @@ public class ViewState {
		view.setScaleY(scaleY);
		}

		boolean becomesInvisible = this.alpha == 0.0f \|\| (this.hidden && !isAnimating(view));
		int oldVisibility = view.getVisibility();
		boolean becomesInvisible = this.alpha == 0.0f
		\|\| (this.hidden && (!isAnimating(view) \|\| oldVisibility != View.VISIBLE));
		boolean animatingAlpha = isAnimating(view, TAG_ANIMATOR_ALPHA);
		if (animatingAlpha) {
		updateAlphaAnimation(view);
		@@ -212,7 +214,6 @@ public class ViewState {
		}

		// apply visibility
		int oldVisibility = view.getVisibility();
		int newVisibility = becomesInvisible ? View.INVISIBLE : View.VISIBLE;
		if (newVisibility != oldVisibility) {
		if (!(view instanceof ExpandableView) \|\| !((ExpandableView) view).willBeGone()) {