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

Merge "Fixed an issue where would could be left with empty notifications" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-06 22:54:36 +00:00
committed by Android (Google) Code Review
parent 08b953dd2e 77cb4d2cd0
commit 25e509462f
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -471,6 +471,7 @@ public class StatusBar extends SystemUI implements DemoMode,
int mSystemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE; int mSystemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE;
private final Rect mLastFullscreenStackBounds = new Rect(); private final Rect mLastFullscreenStackBounds = new Rect();
private final Rect mLastDockedStackBounds = new Rect(); private final Rect mLastDockedStackBounds = new Rect();
private final Rect mTmpRect = new Rect();
// last value sent to window manager // last value sent to window manager
private int mLastDispatchedSystemUiVisibility = ~View.SYSTEM_UI_FLAG_VISIBLE; private int mLastDispatchedSystemUiVisibility = ~View.SYSTEM_UI_FLAG_VISIBLE;
@@ -1371,20 +1372,33 @@ public class StatusBar extends SystemUI implements DemoMode,
int numChildren = mStackScroller.getChildCount(); int numChildren = mStackScroller.getChildCount();
final ArrayList<View> viewsToHide = new ArrayList<View>(numChildren); final ArrayList<View> viewsToHide = new ArrayList<View>(numChildren);
final ArrayList<ExpandableNotificationRow> viewsToRemove = new ArrayList<>(numChildren);
for (int i = 0; i < numChildren; i++) { for (int i = 0; i < numChildren; i++) {
final View child = mStackScroller.getChildAt(i); final View child = mStackScroller.getChildAt(i);
if (child instanceof ExpandableNotificationRow) { if (child instanceof ExpandableNotificationRow) {
if (mStackScroller.canChildBeDismissed(child)) {
if (child.getVisibility() == View.VISIBLE) {
viewsToHide.add(child);
}
}
ExpandableNotificationRow row = (ExpandableNotificationRow) child; ExpandableNotificationRow row = (ExpandableNotificationRow) child;
boolean parentVisible = false;
boolean hasClipBounds = child.getClipBounds(mTmpRect);
if (mStackScroller.canChildBeDismissed(child)) {
viewsToRemove.add(row);
if (child.getVisibility() == View.VISIBLE
&& (!hasClipBounds || mTmpRect.height() > 0)) {
viewsToHide.add(child);
parentVisible = true;
}
} else if (child.getVisibility() == View.VISIBLE
&& (!hasClipBounds || mTmpRect.height() > 0)) {
parentVisible = true;
}
List<ExpandableNotificationRow> children = row.getNotificationChildren(); List<ExpandableNotificationRow> children = row.getNotificationChildren();
if (row.areChildrenExpanded() && children != null) { if (children != null) {
for (ExpandableNotificationRow childRow : children) { for (ExpandableNotificationRow childRow : children) {
if (mStackScroller.canChildBeDismissed(childRow)) { viewsToRemove.add(childRow);
if (childRow.getVisibility() == View.VISIBLE) { if (parentVisible && row.areChildrenExpanded()
&& mStackScroller.canChildBeDismissed(childRow)) {
hasClipBounds = childRow.getClipBounds(mTmpRect);
if (childRow.getVisibility() == View.VISIBLE
&& (!hasClipBounds || mTmpRect.height() > 0)) {
viewsToHide.add(childRow); viewsToHide.add(childRow);
} }
} }
@@ -1392,7 +1406,7 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
} }
} }
if (viewsToHide.isEmpty()) { if (viewsToRemove.isEmpty()) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
return; return;
} }
@@ -1401,6 +1415,13 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override @Override
public void run() { public void run() {
mStackScroller.setDismissAllInProgress(false); mStackScroller.setDismissAllInProgress(false);
for (ExpandableNotificationRow rowToRemove : viewsToRemove) {
if (mStackScroller.canChildBeDismissed(rowToRemove)) {
removeNotification(rowToRemove.getEntry().key, null);
} else {
rowToRemove.resetTranslation();
}
}
try { try {
mBarService.onClearAllNotifications(mCurrentUserId); mBarService.onClearAllNotifications(mCurrentUserId);
} catch (Exception ex) { } } catch (Exception ex) { }