Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic464ddc719af05539a7afd404eb22301bc15e859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-03-09 05:28:55 +00:00
committed by Automerger Merge Worker
parent 3b46216b1b 05f4f569b0
commit 4b729d91a3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -839,6 +839,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
} }
mFrame = null; mFrame = null;
mOrientationHandle = null; mOrientationHandle = null;
notifyNavigationBarSurface();
} }
// TODO: Remove this when we update nav bar recreation // TODO: Remove this when we update nav bar recreation
@@ -1003,7 +1004,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
private void notifyNavigationBarSurface() { private void notifyNavigationBarSurface() {
ViewRootImpl viewRoot = mView.getViewRootImpl(); ViewRootImpl viewRoot = mView.getViewRootImpl();
SurfaceControl surface = viewRoot != null SurfaceControl surface = mView.getParent() != null
&& viewRoot != null
&& viewRoot.getSurfaceControl() != null && viewRoot.getSurfaceControl() != null
&& viewRoot.getSurfaceControl().isValid() && viewRoot.getSurfaceControl().isValid()
? viewRoot.getSurfaceControl() ? viewRoot.getSurfaceControl()