Merge "Update the navbar surface when the nav bar is detached" into udc-dev (05f4f569) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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()