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

Commit 3e040180 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar Refactor] Remove thisFrac from... 

Merge "[Status Bar Refactor] Remove thisFrac from PanelBar#panelExpansionChanged." into sc-v2-dev am: 5bd82847

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15837508

Change-Id: Ic5f7548c5476e6bb6d9022ab37f26a95aff98a68
parents 3bdfc452 5bd82847

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

+2 −5
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ public abstract class PanelBar extends FrameLayout { 
        }

        boolean fullyClosed = true;

        boolean fullyOpened = false;

        if (SPEW) LOG("panelExpansionChanged: start state=%d", mState);

        PanelViewController pv = mPanel;

        if (SPEW) LOG("panelExpansionChanged: start state=%d, f=%.1f", mState, frac);

        mExpanded = expanded;

        mPanelFraction = frac;

        updateVisibility();
@@ -194,9 +193,7 @@ public abstract class PanelBar extends FrameLayout { 
                onPanelPeeked();

            }

            fullyClosed = false;

            final float thisFrac = pv.getExpandedFraction();

            if (SPEW) LOG("panelExpansionChanged:  -> %s: f=%.1f", pv.getName(), thisFrac);

            fullyOpened = thisFrac >= 1f;

            fullyOpened = frac >= 1f;

        }

        if (fullyOpened && !mTracking) {

            go(STATE_OPEN);