Merge "Update TaskbarDelegate to only set default display flags" into main (29a710e4) · Commits · e / os / android_frameworks_base

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -504,6 +504,10 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		@Override
		public void setImeWindowStatus(int displayId, @ImeWindowVisibility int vis,
		@BackDispositionMode int backDisposition, boolean showImeSwitcher) {
		if (displayId != mDefaultDisplayId) {
		return;
		}

		final boolean isImeVisible = mNavBarHelper.isImeVisible(vis);
		final int flags = Utilities.updateNavbarFlagsFromIme(mNavbarFlags, backDisposition,
		isImeVisible, showImeSwitcher);
		@@ -532,8 +536,10 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,

		@Override
		public void disable(int displayId, int state1, int state2, boolean animate) {
		if (displayId == mDefaultDisplayId) {
		mDisabledFlags = state1;
		updateSysuiFlags();
		}
		mLauncherProxyService.disable(displayId, state1, state2, animate);
		}

		@@ -543,16 +549,18 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		@InsetsType int requestedVisibleTypes, String packageName,
		LetterboxDetails[] letterboxDetails) {
		mLauncherProxyService.onSystemBarAttributesChanged(displayId, behavior);
		if (displayId != mDefaultDisplayId) {
		return;
		}

		boolean nbModeChanged = false;
		if (mAppearance != appearance) {
		mAppearance = appearance;
		nbModeChanged = updateTransitionMode(
		transitionMode(mTaskbarTransientShowing, appearance));
		}
		if (displayId == mDefaultDisplayId) {
		mLightBarController.onNavigationBarAppearanceChanged(appearance, nbModeChanged,
		mTransitionMode, navbarColorManagedByIme);
		}
		if (mBehavior != behavior) {
		mBehavior = behavior;
		updateSysuiFlags();