Merge "Only set text when it actually changes" into pi-dev (32527914) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+9 −13

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@ import java.util.Collections;
		import java.util.Comparator;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Objects;
		import java.util.function.BiConsumer;

		/**
		@@ -4078,23 +4077,20 @@ public class NotificationStackScrollLayout extends ViewGroup
		int newVisibility = visible ? VISIBLE : GONE;

		boolean changedVisibility = oldVisibility != newVisibility;
		if (changedVisibility \|\| newVisibility != GONE) {
		if (changedVisibility) {
		if (newVisibility != GONE) {
		int oldText = mEmptyShadeView.getTextResource();
		int newText;
		if (mStatusBar.areNotificationsHidden()) {
		newText = R.string.dnd_suppressing_shade_text;
		} else {
		newText = R.string.empty_shade_text;
		}
		if (changedVisibility \|\| !Objects.equals(oldText, newText)) {
		mEmptyShadeView.setText(newText);
		showFooterView(mEmptyShadeView);
		}
		} else {
		hideFooterView(mEmptyShadeView, true);
		}
		}

		int oldTextRes = mEmptyShadeView.getTextResource();
		int newTextRes = mStatusBar.areNotificationsHidden()
		? R.string.dnd_suppressing_shade_text : R.string.empty_shade_text;
		if (oldTextRes != newTextRes) {
		mEmptyShadeView.setText(newTextRes);
		}
		}

		public void updateFooterView(boolean visible, boolean showDismissView) {