Merge "Fix a couple small issues in nav bar fragment" into rvc-dev am: 5a7fa9af64 (7fce2f4e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -551,16 +551,17 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		public void setWindowState(
		int displayId, @WindowType int window, @WindowVisibleState int state) {
		if (displayId == mDisplayId
		&& mNavigationBarView != null
		&& window == StatusBarManager.WINDOW_NAVIGATION_BAR
		&& mNavigationBarWindowState != state) {
		mNavigationBarWindowState = state;
		updateSystemUiStateFlags(-1);
		if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));

		updateSystemUiStateFlags(-1);
		if (mNavigationBarView != null) {
		mNavigationBarView.setWindowVisible(isNavBarWindowVisible());
		}
		}
		}

		@Override
		public void onRotationProposal(final int rotation, boolean isValid) {
		@@ -1219,6 +1220,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		@Override
		public void onViewDetachedFromWindow(View v) {
		FragmentHostManager.removeAndDestroy(v);
		navigationBarView.removeOnAttachStateChangeListener(this);
		}
		});
		context.getSystemService(WindowManager.class).addView(navigationBarView, lp);