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

Commit 4b9949bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev am: fee4f537 am: 27fb261f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20215963



Change-Id: I981eb5421aae1702af9649c1714f25c2bd6dcdc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90aa9462 27fb261f

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;