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

Commit fbcaefde authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Remove unused isShadeOpening state" into tm-dev

parents 9b4b25e3 56429830

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ public class AmbientState { 
    private Runnable mOnPulseHeightChangedListener;

    private Runnable mOnPulseHeightChangedListener;

    private ExpandableNotificationRow mTrackedHeadsUpRow;

    private ExpandableNotificationRow mTrackedHeadsUpRow;

    private float mAppearFraction;

    private float mAppearFraction;

    private boolean mIsShadeOpening;

    private float mOverExpansion;

    private float mOverExpansion;

    private int mStackTopMargin;

    private int mStackTopMargin;
@@ -219,14 +218,6 @@ public class AmbientState { 
        mBaseZHeight = getBaseHeight(mZDistanceBetweenElements);

        mBaseZHeight = getBaseHeight(mZDistanceBetweenElements);

    }

    }





    public void setIsShadeOpening(boolean isOpening) {

        mIsShadeOpening = isOpening;

    }



    public boolean isShadeOpening() {

        return mIsShadeOpening;

    }



    void setOverExpansion(float overExpansion) {

    void setOverExpansion(float overExpansion) {

        mOverExpansion = overExpansion;

        mOverExpansion = overExpansion;

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -4900,7 +4900,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private int mCurrentPanelState = STATE_CLOSED;

    private int mCurrentPanelState = STATE_CLOSED;





    private void onPanelStateChanged(@PanelState int state) {

    private void onPanelStateChanged(@PanelState int state) {

        mAmbientState.setIsShadeOpening(state == STATE_OPENING);

        updateQSExpansionEnabledAmbient();

        updateQSExpansionEnabledAmbient();





        if (state == STATE_OPEN && mCurrentPanelState != state) {

        if (state == STATE_OPEN && mCurrentPanelState != state) {