Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffd42777 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Remove unused qs_peek_height, redundant height method" into udc-qpr-dev

parents ae3fcf13 4e225355

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -663,9 +663,6 @@ 


    <dimen name="restricted_padlock_pading">4dp</dimen>



    <!-- How far the expanded QS panel peeks from the header in collapsed state. -->

    <dimen name="qs_peek_height">0dp</dimen>



    <!-- Padding between subtitles and the following text in the QSFooter dialog -->

    <dimen name="qs_footer_dialog_subtitle_padding">20dp</dimen>

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                // so we should not add a padding for them

                stackScrollerPadding = 0;

            } else {

                stackScrollerPadding = mQsController.getUnlockedStackScrollerPadding();

                stackScrollerPadding = mQsController.getHeaderHeight();

            }

        } else {

            stackScrollerPadding = mClockPositionResult.stackScrollerPaddingExpanded;
@@ -1520,7 +1520,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                userSwitcherPreferredY,

                darkAmount, mOverStretchAmount,

                bypassEnabled,

                mQsController.getUnlockedStackScrollerPadding(),

                mQsController.getHeaderHeight(),

                mQsController.computeExpansionFraction(),

                mDisplayTopInset,

                mSplitShadeEnabled,

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+1 −10
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ public class QuickSettingsController implements Dumpable { 
    private int mMaxExpansionHeight;

    /** Expansion fraction of the notification shade */

    private float mShadeExpandedFraction;

    private int mPeekHeight;

    private float mLastOverscroll;

    private boolean mExpansionFromOverscroll;

    private boolean mExpansionEnabledPolicy = true;
@@ -429,7 +428,6 @@ public class QuickSettingsController implements Dumpable { 
        final ViewConfiguration configuration = ViewConfiguration.get(this.mPanelView.getContext());

        mTouchSlop = configuration.getScaledTouchSlop();

        mSlopMultiplier = configuration.getScaledAmbiguousGestureMultiplier();

        mPeekHeight = mResources.getDimensionPixelSize(R.dimen.qs_peek_height);

        mStatusBarMinHeight = SystemBarUtils.getStatusBarHeight(mPanelView.getContext());

        mScrimCornerRadius = mResources.getDimensionPixelSize(

                R.dimen.notification_scrim_corner_radius);
@@ -500,12 +498,7 @@ public class QuickSettingsController implements Dumpable { 
    }



    int getHeaderHeight() {

        return mQs.getHeader().getHeight();

    }



    /** Returns the padding of the stackscroller when unlocked */

    int getUnlockedStackScrollerPadding() {

        return (mQs != null ? mQs.getHeader().getHeight() : 0) + mPeekHeight;

        return isQsFragmentCreated() ? mQs.getHeader().getHeight() : 0;

    }



    private boolean isRemoteInputActiveWithKeyboardUp() {
@@ -2090,8 +2083,6 @@ public class QuickSettingsController implements Dumpable { 
        ipw.println(mMaxExpansionHeight);

        ipw.print("mShadeExpandedFraction=");

        ipw.println(mShadeExpandedFraction);

        ipw.print("mPeekHeight=");

        ipw.println(mPeekHeight);

        ipw.print("mLastOverscroll=");

        ipw.println(mLastOverscroll);

        ipw.print("mExpansionFromOverscroll=");