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

Finishing up heads up changes

Browse Source 
Fixed a bug where the QS could be expanded when collapsed.
More refactorings, removed todos

Change-Id: I6dea262456c529d7f4a8a4a6a4fdc0e46597bafe
This commit is contained in:
Selim Cinek
2015-04-14 20:31:54 -07:00
parent aac932591d
commit d853586993
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -537,7 +537,7 @@ public class NotificationPanelView extends PanelView implements
mExpansionIsFromHeadsUp = true;
return true;
}
if (onQsIntercept(event)) {
if (!isShadeCollapsed() && onQsIntercept(event)) {
return true;
}
return super.onInterceptTouchEvent(event);
@@ -708,7 +708,7 @@ public class NotificationPanelView extends PanelView implements
mInitialTouchY = event.getX();
mInitialTouchX = event.getY();
}
if (mExpandedHeight != 0) {
if (!isShadeCollapsed()) {
handleQsDown(event);
}
if (!mQsExpandImmediate && mQsTracking) {
@@ -1446,7 +1446,7 @@ public class NotificationPanelView extends PanelView implements
updateHeader();
updateUnlockIcon();
updateNotificationTranslucency();
mHeadsUpManager.setIsExpanded(expandedHeight != 0);
mHeadsUpManager.setIsExpanded(!isShadeCollapsed());
mNotificationStackScroller.setShadeExpanded(!isShadeCollapsed());
if (DEBUG) {
invalidate();
@@ -1668,8 +1668,7 @@ public class NotificationPanelView extends PanelView implements
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 @@ public class NotificationPanelView extends PanelView implements
@Override
protected boolean isShadeCollapsed() {
return mExpandedHeight == 0 || mHeadsUpManager.hasPinnedHeadsUp();
return mExpandedHeight == 0;
}
@Override

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

@@ -234,7 +234,7 @@ public abstract class PanelView extends FrameLayout {
final float y = event.getY(pointerIndex);
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
mGestureWaitForTouchSlop = mExpandedHeight == 0f;
mGestureWaitForTouchSlop = isShadeCollapsed();
}
boolean waitForTouchSlop = hasConflictingGestures() || mGestureWaitForTouchSlop;
@@ -242,7 +242,7 @@ public abstract class PanelView extends FrameLayout {
case MotionEvent.ACTION_DOWN:
startExpandMotion(x, y, false /* startTracking */, mExpandedHeight);
mJustPeeked = false;
mPanelClosedOnDown = mExpandedHeight == 0.0f;
mPanelClosedOnDown = isShadeCollapsed();
mHasLayoutedSinceDown = false;
mUpdateFlingOnLayout = false;
mMotionAborted = false;
@@ -260,7 +260,7 @@ public abstract class PanelView extends FrameLayout {
|| mPeekPending || mPeekAnimator != null;
onTrackingStarted();
}
if (mExpandedHeight == 0) {
if (isShadeCollapsed()) {
schedulePeek();
}
break;
@@ -448,7 +448,7 @@ public abstract class PanelView extends FrameLayout {
mTouchSlopExceeded = false;
mJustPeeked = false;
mMotionAborted = false;
mPanelClosedOnDown = mExpandedHeight == 0.0f;
mPanelClosedOnDown = isShadeCollapsed();
mHasLayoutedSinceDown = false;
mUpdateFlingOnLayout = false;
mTouchAboveFalsingThreshold = false;
@@ -730,7 +730,6 @@ public abstract class PanelView extends FrameLayout {
}
public boolean isFullyCollapsed() {
// TODO: look into whether this is still correct with HUN's
return mExpandedHeight <= 0;
}