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

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

Merge changes I5d575dcd,Ib277941d 

* changes:
  Tidy PhoneStatusBarView
  Remove StatusBar#getStatusBarView
parents 09caa607 18ea2952

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.Dependency; 
import com.android.systemui.R;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.statusbar.window.StatusBarWindowView;

import com.android.systemui.util.leak.RotationUtils;



import java.util.Objects;
@@ -76,6 +75,7 @@ public class PhoneStatusBarView extends FrameLayout { 


    @Override

    public void onFinishInflate() {

        super.onFinishInflate();

        mBattery = findViewById(R.id.battery);

        mClock = findViewById(R.id.clock);

        mCutoutSpace = findViewById(R.id.cutout_space_view);

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

+13 −22
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class StatusBar extends CoreStartable implements 
        mStatusBarWindowState =  state;

        mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;

        mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);

        if (getStatusBarView() != null) {

        if (mStatusBarView != null) {

            // Should #updateHideIconsForBouncer always be called, regardless of whether we have a

            //   status bar view? If so, we can make #updateHideIconsForBouncer private.

            mStatusBarHideIconsForBouncerManager.updateHideIconsForBouncer(/* animate= */ false);
@@ -1124,11 +1124,7 @@ public class StatusBar extends CoreStartable implements 
        // Set up CollapsedStatusBarFragment and PhoneStatusBarView

        StatusBarInitializer initializer = mStatusBarComponent.getStatusBarInitializer();

        initializer.setStatusBarViewUpdatedListener(

                new StatusBarInitializer.OnStatusBarViewUpdatedListener() {

                    @Override

                    public void onStatusBarViewUpdated(

                            @NonNull PhoneStatusBarView statusBarView,

                            @NonNull PhoneStatusBarViewController statusBarViewController) {

                (statusBarView, statusBarViewController) -> {

                    mStatusBarView = statusBarView;

                    mPhoneStatusBarViewController = statusBarViewController;

                    mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
@@ -1140,7 +1136,6 @@ public class StatusBar extends CoreStartable implements 
                    mNotificationPanelViewController.updatePanelExpansionAndVisibility();

                    setBouncerShowingForStatusBarComponents(mBouncerShowing);

                    checkBarModes();

                    }

                });

        initializer.initializeStatusBar(mStatusBarComponent);
@@ -1578,10 +1573,6 @@ public class StatusBar extends CoreStartable implements 
        Trace.endSection();

    }



    protected PhoneStatusBarView getStatusBarView() {

        return mStatusBarView;

    }



    public NotificationShadeWindowView getNotificationShadeWindowView() {

        return mNotificationShadeWindowView;

    }