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

Commit a8d90577 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Conserve expansion after re-inflation"

parents 947df927 5220db78

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

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ public abstract class PanelBar extends FrameLayout { 
    private static final String STATE = "state";

    private boolean mBouncerShowing;

    private boolean mExpanded;

    protected float mPanelFraction;



    public static final void LOG(String fmt, Object... args) {

        if (!DEBUG) return;
@@ -99,6 +100,14 @@ public abstract class PanelBar extends FrameLayout { 
        if (mPanel != null) mPanel.setImportantForAccessibility(important);

    }



    public float getExpansionFraction() {

        return mPanelFraction;

    }



    public boolean isExpanded() {

        return mExpanded;

    }



    private void updateVisibility() {

        mPanel.setVisibility(mExpanded || mBouncerShowing ? VISIBLE : INVISIBLE);

    }
@@ -153,6 +162,7 @@ public abstract class PanelBar extends FrameLayout { 
        if (SPEW) LOG("panelExpansionChanged: start state=%d", mState);

        PanelView pv = mPanel;

        mExpanded = expanded;

        mPanelFraction = frac;

        updateVisibility();

        // adjust any other panels that may be partially visible

        if (expanded) {

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

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ public class PhoneStatusBarView extends PanelBar { 
    private final PhoneStatusBarTransitions mBarTransitions;

    private ScrimController mScrimController;

    private float mMinFraction;

    private float mPanelFraction;

    private Runnable mHideExpandedRunnable = new Runnable() {

        @Override

        public void run() {
@@ -269,7 +268,6 @@ public class PhoneStatusBarView extends PanelBar { 
    @Override

    public void panelExpansionChanged(float frac, boolean expanded) {

        super.panelExpansionChanged(frac, expanded);

        mPanelFraction = frac;

        updateScrimFraction();

        if ((frac == 0 || frac == 1) && mBar.getNavigationBarView() != null) {

            mBar.getNavigationBarView().onPanelExpandedChange(expanded);

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

+6 −0
Original line number Diff line number Diff line
@@ -833,6 +833,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    CollapsedStatusBarFragment statusBarFragment =

                            (CollapsedStatusBarFragment) fragment;

                    statusBarFragment.initNotificationIconArea(mNotificationIconAreaController);

                    PhoneStatusBarView oldStatusBarView = mStatusBarView;

                    mStatusBarView = (PhoneStatusBarView) fragment.getView();

                    mStatusBarView.setBar(this);

                    mStatusBarView.setPanel(mNotificationPanel);
@@ -849,6 +850,11 @@ public class StatusBar extends SystemUI implements DemoMode, 
                        mNotificationPanel.notifyBarPanelExpansionChanged();

                    }

                    mStatusBarView.setBouncerShowing(mBouncerShowing);

                    if (oldStatusBarView != null) {

                        float fraction = oldStatusBarView.getExpansionFraction();

                        boolean expanded = oldStatusBarView.isExpanded();

                        mStatusBarView.panelExpansionChanged(fraction, expanded);

                    }



                    HeadsUpAppearanceController oldController = mHeadsUpAppearanceController;

                    if (mHeadsUpAppearanceController != null) {