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

Merge "Fix a couple small issues in nav bar fragment" into rvc-dev am: 5a7fa9af64 am: 7fce2f4efe am: bf5751bcc6

Browse Source 
Change-Id: I4ebcd72fcef4bf7d088465dc97cd736c23510aa9
This commit is contained in:
Automerger Merge Worker
2020-03-16 06:22:34 +00:00
parent be5a627fa6 bf5751bcc6
commit b5746a6ae6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,14 +551,15 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
public void setWindowState( public void setWindowState(
int displayId, @WindowType int window, @WindowVisibleState int state) { int displayId, @WindowType int window, @WindowVisibleState int state) {
if (displayId == mDisplayId if (displayId == mDisplayId
&& mNavigationBarView != null
&& window == StatusBarManager.WINDOW_NAVIGATION_BAR && window == StatusBarManager.WINDOW_NAVIGATION_BAR
&& mNavigationBarWindowState != state) { && mNavigationBarWindowState != state) {
mNavigationBarWindowState = state; mNavigationBarWindowState = state;
updateSystemUiStateFlags(-1);
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state)); if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));
updateSystemUiStateFlags(-1); if (mNavigationBarView != null) {
mNavigationBarView.setWindowVisible(isNavBarWindowVisible()); mNavigationBarView.setWindowVisible(isNavBarWindowVisible());
}
} }
} }
@@ -1219,6 +1220,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
@Override @Override
public void onViewDetachedFromWindow(View v) { public void onViewDetachedFromWindow(View v) {
FragmentHostManager.removeAndDestroy(v); FragmentHostManager.removeAndDestroy(v);
navigationBarView.removeOnAttachStateChangeListener(this);
} }
}); });
context.getSystemService(WindowManager.class).addView(navigationBarView, lp); context.getSystemService(WindowManager.class).addView(navigationBarView, lp);