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

Commit be19e650 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 21a1c0f6: Merge "Temporary workaround for recent system UI regression." 

* commit '21a1c0f6df3943d0792d1a2612e7ac9d3571d657':
  Temporary workaround for recent system UI regression.
parents 49e9b0ad 4f9d2597

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

+8 −2
Original line number Diff line number Diff line
@@ -44,12 +44,16 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 


    public void init() {

        mLeftSide = mView.findViewById(R.id.notification_icon_area);

        initStatus();

        applyModeBackground(-1, getMode(), false /*animate*/);

        applyMode(getMode(), false /*animate*/);

    }



    private void initStatus() {

        mStatusIcons = mView.findViewById(R.id.statusIcons);

        mSignalCluster = mView.findViewById(R.id.signal_cluster);

        mBattery = mView.findViewById(R.id.battery);

        mClock = mView.findViewById(R.id.clock);

        applyModeBackground(-1, getMode(), false /*animate*/);

        applyMode(getMode(), false /*animate*/);

    }



    public ObjectAnimator animateTransitionTo(View v, float toAlpha) {
@@ -79,6 +83,8 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 


    private void applyMode(int mode, boolean animate) {

        if (mLeftSide == null) return; // pre-init

        if (mStatusIcons == null) initStatus();

        if (mStatusIcons == null) return;

        float newAlpha = getNonBatteryClockAlphaFor(mode);

        float newAlphaBC = getBatteryClockAlpha(mode);

        if (mCurrentAnimation != null) {