Move QS Edit into QSContainer
This will let it play nicely with heads up.
- Move to QS Container.
- QS Edit is always full height (some layout hacks to do this)
- Always draw QS customizer on top when animating
- Block all panel scrolling while QS edit is open (all touches
go to editing)
- Instantaneously change the height of the QS container at
start/end of animation as needed
Bug: 26969293
Change-Id: Iedc6f5aaf659dcc6750972eae5f69cc0cd2df844
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 88b8afa..9c6f2c5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -65,7 +65,7 @@
import java.util.List;
public class NotificationPanelView extends PanelView implements
- ExpandableView.OnHeightChangedListener, ObservableScrollView.Listener,
+ ExpandableView.OnHeightChangedListener,
View.OnClickListener, NotificationStackScrollLayout.OnOverscrollTopChangedListener,
KeyguardAffordanceHelper.Callback, NotificationStackScrollLayout.OnEmptySpaceClickListener,
HeadsUpManager.OnHeadsUpChangedListener {
@@ -222,6 +222,7 @@
@Override
public void onInflated(View v) {
mQsContainer = (QSContainer) v.findViewById(R.id.quick_settings_container);
+ mQsContainer.setPanelView(NotificationPanelView.this);
mQsContainer.getHeader().setOnClickListener(NotificationPanelView.this);
}
});
@@ -247,7 +248,7 @@
final int height = bottom - top;
final int oldHeight = oldBottom - oldTop;
if (height != oldHeight) {
- onScrollChanged();
+ onQsHeightChanged();
}
}
});
@@ -547,7 +548,7 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
- if (mBlockTouches) {
+ if (mBlockTouches || mQsContainer.isCustomizing()) {
return false;
}
initDownStates(event);
@@ -707,7 +708,7 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (mBlockTouches) {
+ if (mBlockTouches || mQsContainer.isCustomizing()) {
return false;
}
initDownStates(event);
@@ -906,18 +907,6 @@
}
@Override
- public void onOverscrolled(float lastTouchX, float lastTouchY, int amount) {
- if (mIntercepting && shouldQuickSettingsIntercept(lastTouchX, lastTouchY,
- -1 /* yDiff: Not relevant here */)) {
- mQsTracking = true;
- onQsExpansionStarted(amount);
- mInitialHeightOnTouch = mQsExpansionHeight;
- mInitialTouchY = mLastTouchY;
- mInitialTouchX = mLastTouchX;
- }
- }
-
- @Override
public void onOverscrollTopChanged(float amount, boolean isRubberbanded) {
cancelQsAnimation();
if (!mQsExpansionEnabled) {
@@ -1719,9 +1708,10 @@
public void onReset(ExpandableView view) {
}
- @Override
- public void onScrollChanged() {
+ public void onQsHeightChanged() {
+ mQsMaxExpansionHeight = mQsContainer.getDesiredHeight();
if (mQsExpanded) {
+ mQsExpansionHeight = mQsMaxExpansionHeight;
requestScrollerTopPaddingUpdate(false /* animate */);
requestPanelHeightUpdate();
}