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

Merge "Fix inflating content views after removal" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-26 10:22:58 +00:00
committed by Android (Google) Code Review
parent c805ce31f7 a052c0ca0b
commit 768070530b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
View File

@@ -807,7 +807,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
// TODO: Move inflation logic out of this call // TODO: Move inflation logic out of this call
if (mIsChildInGroup != isChildInGroup) { if (mIsChildInGroup != isChildInGroup) {
mIsChildInGroup = isChildInGroup; mIsChildInGroup = isChildInGroup;
if (mIsLowPriority) { if (!isRemoved() && mIsLowPriority) {
RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry); RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry);
params.setUseLowPriority(mIsLowPriority); params.setUseLowPriority(mIsLowPriority);
mRowContentBindStage.requestRebind(mEntry, null /* callback */); mRowContentBindStage.requestRebind(mEntry, null /* callback */);
@@ -1576,6 +1576,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
// TODO: Move inflation logic out of this call and remove this method // TODO: Move inflation logic out of this call and remove this method
if (mNeedsRedaction != needsRedaction) { if (mNeedsRedaction != needsRedaction) {
mNeedsRedaction = needsRedaction; mNeedsRedaction = needsRedaction;
if (!isRemoved()) {
RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry); RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry);
if (needsRedaction) { if (needsRedaction) {
params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC); params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC);
@@ -1585,6 +1586,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mRowContentBindStage.requestRebind(mEntry, null /* callback */); mRowContentBindStage.requestRebind(mEntry, null /* callback */);
} }
} }
}
public interface ExpansionLogger { public interface ExpansionLogger {
void logNotificationExpansion(String key, boolean userAction, boolean expanded); void logNotificationExpansion(String key, boolean userAction, boolean expanded);