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

Commit 408a91a1 authored by Garfield Tan's avatar Garfield Tan
Browse files

Guard one more use of CentralSurfaces in NavBar 

Also mark mPanelView in NavigationBarView nullable. All uses of it
already have null checks.

Bug: 254123249
Test: Barbet still looks OK.
Change-Id: I0b0c3017bd89f2d2261283573519301557096b2b
parent 6b311488

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+3 −1
Original line number Diff line number Diff line
@@ -679,7 +679,9 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    public void onViewAttached() {

        final Display display = mView.getDisplay();

        mView.setComponents(mRecentsOptional);

        if (mCentralSurfacesOptionalLazy.get().isPresent()) {

            mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController());

        }

        mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);

        mView.setOnVerticalChangedListener(this::onVerticalChanged);

        mView.setOnTouchListener(this::onNavigationTouch);

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class NavigationBarView extends FrameLayout { 


    private NavigationBarInflaterView mNavigationInflaterView;

    private Optional<Recents> mRecentsOptional = Optional.empty();

    @Nullable

    private NotificationPanelViewController mPanelView;

    private RotationContextButton mRotationContextButton;

    private FloatingRotationButton mFloatingRotationButton;