Fix not being able to pull down status bar.

Bug: 14648079
Change-Id: Id3dbf0b781d5d4777f013804a3877df3347a38fa
This commit is contained in:
Selim Cinek
2014-05-15 15:23:37 +02:00
parent 4f8beae9de
commit 9dbbca879e
3 changed files with 6 additions and 8 deletions

View File

@@ -78,6 +78,7 @@ public class NotificationPanelView extends PanelView implements
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 @@ public class NotificationPanelView extends PanelView implements
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 @@ public class NotificationPanelView extends PanelView implements
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();
}

View File

@@ -224,6 +224,5 @@ public class PanelBar extends FrameLayout {
public void onTrackingStopped(PanelView panel) {
mTracking = false;
panelExpansionChanged(panel, panel.getExpandedFraction());
}
}

View File

@@ -77,12 +77,6 @@ public class PanelHolder extends FrameLayout {
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;
}