Fix not being able to pull down status bar.
Bug: 14648079
Change-Id: Id3dbf0b781d5d4777f013804a3877df3347a38fa
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 9054fe3..b9f5ab2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -78,6 +78,7 @@
private boolean mQsExpansionEnabled = true;
private ValueAnimator mQsExpansionAnimator;
private FlingAnimationUtils mFlingAnimationUtils;
+ private int mStatusBarMinHeight;
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -116,6 +117,8 @@
R.dimen.notifications_top_padding);
mMinStackHeight = getResources().getDimensionPixelSize(R.dimen.collapsed_stack_height);
mFlingAnimationUtils = new FlingAnimationUtils(getContext());
+ mStatusBarMinHeight = getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.status_bar_height);
}
@Override
@@ -520,7 +523,9 @@
int notificationMarginBottom = mStackScrollerContainer.getPaddingBottom();
int emptyBottomMargin = notificationMarginBottom
+ mNotificationStackScroller.getEmptyBottomMargin();
- return maxPanelHeight - emptyBottomMargin;
+ int maxHeight = maxPanelHeight - emptyBottomMargin;
+ maxHeight = Math.max(maxHeight, mStatusBarMinHeight);
+ return maxHeight;
}
return super.getMaxPanelHeight();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
index 324d6f3..8800625 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
@@ -224,6 +224,5 @@
public void onTrackingStopped(PanelView panel) {
mTracking = false;
- panelExpansionChanged(panel, panel.getExpandedFraction());
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java
index c229a09..d7f34d5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java
@@ -77,12 +77,6 @@
event.getActionMasked(), (int) event.getX(), (int) event.getY());
}
}
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN:
- PanelBar.LOG("PanelHolder got touch in open air, closing panels");
- mBar.collapseAllPanels(true);
- break;
- }
return false;
}