Merge "Simplified maxPanelHeight logic." into lmp-preview-dev

    @Override

    protected int getMaxPanelHeight() {

        // TODO: Figure out transition for collapsing when QS is open, adjust height here.

        int maxPanelHeight = super.getMaxPanelHeight();

        int emptyBottomMargin = mNotificationStackScroller.getEmptyBottomMargin();

        emptyBottomMargin += mStackScrollerContainer.getHeight()

                - mNotificationStackScroller.getHeight();

        int maxHeight = maxPanelHeight - emptyBottomMargin - mTopPaddingAdjustment;

        int maxHeight = mNotificationStackScroller.getHeight() - emptyBottomMargin

                - mTopPaddingAdjustment;

        maxHeight = Math.max(maxHeight, mStatusBarMinHeight);

        return maxHeight;

    }