Merge "Only help with HUNing notifications"
This commit is contained in:
committed by
Android (Google) Code Review
commit
085f87eb29
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user