Merge "QS: Fix single expanded frame from layout" into nyc-dev

am: 4215ae0100

* commit '4215ae01002f1217587698d24636870ace4a50f5':
  QS: Fix single expanded frame from layout

Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
This commit is contained in:
Jason Monk
2016-06-01 17:37:49 +00:00
committed by android-build-merger

View File

@@ -1735,7 +1735,7 @@ public class NotificationPanelView extends PanelView implements
public void onQsHeightChanged() {
mQsMaxExpansionHeight = mQsContainer.getDesiredHeight();
if (mQsExpanded) {
if (mQsExpanded && mQsFullyExpanded) {
mQsExpansionHeight = mQsMaxExpansionHeight;
requestScrollerTopPaddingUpdate(false /* animate */);
requestPanelHeightUpdate();