Finishing up heads up changes
Fixed a bug where the QS could be expanded when collapsed.
More refactorings, removed todos
Change-Id: I6dea262456c529d7f4a8a4a6a4fdc0e46597bafe
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index e101197..c266467 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -537,7 +537,7 @@
mExpansionIsFromHeadsUp = true;
return true;
}
- if (onQsIntercept(event)) {
+ if (!isShadeCollapsed() && onQsIntercept(event)) {
return true;
}
return super.onInterceptTouchEvent(event);
@@ -708,7 +708,7 @@
mInitialTouchY = event.getX();
mInitialTouchX = event.getY();
}
- if (mExpandedHeight != 0) {
+ if (!isShadeCollapsed()) {
handleQsDown(event);
}
if (!mQsExpandImmediate && mQsTracking) {
@@ -1446,7 +1446,7 @@
updateHeader();
updateUnlockIcon();
updateNotificationTranslucency();
- mHeadsUpManager.setIsExpanded(expandedHeight != 0);
+ mHeadsUpManager.setIsExpanded(!isShadeCollapsed());
mNotificationStackScroller.setShadeExpanded(!isShadeCollapsed());
if (DEBUG) {
invalidate();
@@ -1668,8 +1668,7 @@
mHeadsUpManager.onExpandingFinished();
mIsExpanding = false;
mScrollYOverride = -1;
- // TODO: look into whether this is still correct
- if (mExpandedHeight == 0f) {
+ if (isShadeCollapsed()) {
setListening(false);
} else {
setListening(true);
@@ -2171,7 +2170,7 @@
@Override
protected boolean isShadeCollapsed() {
- return mExpandedHeight == 0 || mHeadsUpManager.hasPinnedHeadsUp();
+ return mExpandedHeight == 0;
}
@Override