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

Commit 4b729d91 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Update the navbar surface when the nav bar is detached" into udc-dev am: 05f4f569 

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



Change-Id: Ic464ddc719af05539a7afd404eb22301bc15e859
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b46216b 05f4f569

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

+3 −1
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        }

        mFrame = null;

        mOrientationHandle = null;

        notifyNavigationBarSurface();

    }



    // TODO: Remove this when we update nav bar recreation
@@ -1003,7 +1004,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 


    private void notifyNavigationBarSurface() {

        ViewRootImpl viewRoot = mView.getViewRootImpl();

        SurfaceControl surface = viewRoot != null

        SurfaceControl surface = mView.getParent() != null 

                && viewRoot != null

                && viewRoot.getSurfaceControl() != null

                && viewRoot.getSurfaceControl().isValid()

                        ? viewRoot.getSurfaceControl()