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

Merge "Fixed an issue when pulling down from heads up" into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-04 23:51:53 +00:00
committed by Android (Google) Code Review
parent 11969b4919 8032708409
commit fd3b398e91
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
View File

@@ -23,6 +23,7 @@ import android.view.ViewConfiguration;
import com.android.systemui.Gefingerpoken;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.ExpandableView;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
/**
@@ -80,6 +81,14 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
mPickedChild = (ExpandableNotificationRow) child;
mTouchingHeadsUpView = !mStackScroller.isExpanded()
&& mPickedChild.isHeadsUp() && mPickedChild.isPinned();
} else if (child == null && !mStackScroller.isExpanded()) {
// We might touch above the visible heads up child, but then we still would
// like to capture it.
NotificationData.Entry topEntry = mHeadsUpManager.getTopEntry();
if (topEntry != null && topEntry.row.isPinned()) {
mPickedChild = topEntry.row;
mTouchingHeadsUpView = true;
}
}
break;
case MotionEvent.ACTION_POINTER_UP: