Merge "Only help with HUNing notifications"

This commit is contained in:
TreeHugger Robot
2019-10-24 23:40:46 +00:00
committed by Android (Google) Code Review

View File

@@ -77,9 +77,12 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
ExpandableView child = mCallback.getChildAtRawPosition(x, y);
mTouchingHeadsUpView = false;
if (child instanceof ExpandableNotificationRow) {
mPickedChild = (ExpandableNotificationRow) child;
ExpandableNotificationRow pickedChild = (ExpandableNotificationRow) child;
mTouchingHeadsUpView = !mCallback.isExpanded()
&& mPickedChild.isHeadsUp() && mPickedChild.isPinned();
&& pickedChild.isHeadsUp() && pickedChild.isPinned();
if (mTouchingHeadsUpView) {
mPickedChild = pickedChild;
}
} else if (child == null && !mCallback.isExpanded()) {
// We might touch above the visible heads up child, but then we still would
// like to capture it.