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

Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-19 00:40:59 +00:00
committed by Android (Google) Code Review
parent c67e4da871 5186b1311d
commit 4ac6a113ed
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -926,7 +926,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
@Override @Override
public void onSingleTaskDisplayDrawn(int displayId) { public void onSingleTaskDisplayDrawn(int displayId) {
final Bubble expandedBubble = getExpandedBubble(mContext); final Bubble expandedBubble = mStackView != null
? mStackView.getExpandedBubble()
: null;
if (expandedBubble != null && expandedBubble.getDisplayId() == displayId) { if (expandedBubble != null && expandedBubble.getDisplayId() == displayId) {
expandedBubble.setContentVisibility(true); expandedBubble.setContentVisibility(true);
} }
@@ -934,7 +936,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
@Override @Override
public void onSingleTaskDisplayEmpty(int displayId) { public void onSingleTaskDisplayEmpty(int displayId) {
final Bubble expandedBubble = getExpandedBubble(mContext); final Bubble expandedBubble = mStackView != null
? mStackView.getExpandedBubble()
: null;
if (expandedBubble == null) { if (expandedBubble == null) {
return; return;
} }