Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df0f... (aaecb657) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -546,7 +546,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		navBarFragment.updateSystemUiStateFlags(-1);
		}
		if (navBarView != null) {
		navBarView.updateSystemUiStateFlags();
		navBarView.updatePanelSystemUiStateFlags();
		navBarView.updateDisabledSystemUiStateFlags();
		}
		if (mStatusBarWinController != null) {
		mStatusBarWinController.notifyStateChangedCallbacks();

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -323,7 +323,7 @@ public class NavigationBarView extends FrameLayout implements

		public void setComponents(NotificationPanelView panel, AssistManager assistManager) {
		mPanelView = panel;
		updateSystemUiStateFlags();
		updatePanelSystemUiStateFlags();
		}

		@Override
		@@ -587,7 +587,7 @@ public class NavigationBarView extends FrameLayout implements
		updateNavButtonIcons();
		updateSlippery();
		setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
		updateSystemUiStateFlags();
		updateDisabledSystemUiStateFlags();
		}

		public void updateNavButtonIcons() {
		@@ -710,10 +710,10 @@ public class NavigationBarView extends FrameLayout implements

		public void onStatusBarPanelStateChanged() {
		updateSlippery();
		updateSystemUiStateFlags();
		updatePanelSystemUiStateFlags();
		}

		public void updateSystemUiStateFlags() {
		public void updateDisabledSystemUiStateFlags() {
		int displayId = mContext.getDisplayId();
		mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SCREEN_PINNING,
		ActivityManagerWrapper.getInstance().isScreenPinningActive(), displayId);
		@@ -723,6 +723,10 @@ public class NavigationBarView extends FrameLayout implements
		(mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0, displayId);
		mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SEARCH_DISABLED,
		(mDisabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0, displayId);
		}

		public void updatePanelSystemUiStateFlags() {
		int displayId = mContext.getDisplayId();
		if (mPanelView != null) {
		mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
		mPanelView.isFullyExpanded() && !mPanelView.isInSettings(), displayId);