am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev

* commit 'e4de3fbe2ff869ed904bbfaf54903b9095cb7206':
  Fixed a bug where the notifications and the clock could jump
This commit is contained in:
Selim Cinek
2014-09-11 12:27:05 +00:00
committed by Android Git Automerger

View File

@ -276,6 +276,7 @@ public class NotificationPanelView extends PanelView implements
// Calculate quick setting heights.
mQsMinExpansionHeight = mKeyguardShowing ? 0 : mHeader.getCollapsedHeight() + mQsPeekHeight;
mQsMaxExpansionHeight = mHeader.getExpandedHeight() + mQsContainer.getHeight();
positionClockAndNotifications();
if (mQsExpanded) {
if (mQsFullyExpanded) {
mQsExpansionHeight = mQsMaxExpansionHeight;
@ -283,7 +284,6 @@ public class NotificationPanelView extends PanelView implements
}
} else {
setQsExpansion(mQsMinExpansionHeight + mLastOverscroll);
positionClockAndNotifications();
mNotificationStackScroller.setStackHeight(getExpandedHeight());
updateHeader();
}