Merge "Update the navbar surface when the nav bar is detached" into udc-dev

This commit is contained in:
Winson Chung
2023-03-09 05:05:50 +00:00
committed by Android (Google) Code Review

View File

@@ -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()