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

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

Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev

parents a45c7f7d 408a91a1

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

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

    public void onViewAttached() {

        final Display display = mView.getDisplay();

        final Display display = mView.getDisplay();

        mView.setComponents(mRecentsOptional);

        mView.setComponents(mRecentsOptional);

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

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

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

        }

        mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);

        mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);

        mView.setOnVerticalChangedListener(this::onVerticalChanged);

        mView.setOnVerticalChangedListener(this::onVerticalChanged);

        mView.setOnTouchListener(this::onNavigationTouch);

        mView.setOnTouchListener(this::onNavigationTouch);

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

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




    private NavigationBarInflaterView mNavigationInflaterView;

    private NavigationBarInflaterView mNavigationInflaterView;

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

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

    @Nullable

    private NotificationPanelViewController mPanelView;

    private NotificationPanelViewController mPanelView;

    private RotationContextButton mRotationContextButton;

    private RotationContextButton mRotationContextButton;

    private FloatingRotationButton mFloatingRotationButton;

    private FloatingRotationButton mFloatingRotationButton;