Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only set text when it actually changes" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-10 15:50:47 +00:00
committed by Android (Google) Code Review
parent 90f3d72b91 c9274ff904
commit 84115d29ef
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
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) {