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

Commit de19cc6f authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Real fix for recent SystemUI crash."

parents ef5a7d78 acea1000

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

+2 −8
Original line number Diff line number Diff line
@@ -44,16 +44,12 @@ 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) {
@@ -83,8 +79,6 @@ 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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class PhoneStatusBarView extends PanelBar { 
    }



    @Override

    public void onAttachedToWindow() {

    public void onFinishInflate() {

        mBarTransitions.init();

    }