Merge "Fix 3-button showing up briefly on the AllSet page in setup" into main (74ed411d) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -376,6 +376,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		(flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 \|\|
		(flags & FLAG_KEYGUARD_OCCLUDED) != 0;
		return (flags & FLAG_DISABLE_BACK) == 0
		&& (!mContext.isGestureNav() \|\| !mContext.isUserSetupComplete())
		&& ((flags & FLAG_KEYGUARD_VISIBLE) == 0 \|\| showingOnKeyguard);
		}));
		// Hide back button in SUW if keyboard is showing (IME draws its own back).
		@@ -406,8 +407,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		mPropertyHolders.add(
		new StatePropertyHolder(mHomeButtonAlpha.get(
		ALPHA_INDEX_KEYGUARD_OR_DISABLE),
		flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 &&
		(flags & FLAG_DISABLE_HOME) == 0));
		flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0
		&& (flags & FLAG_DISABLE_HOME) == 0 && !mContext.isGestureNav()));

		// Recents button
		mRecentsButton = addButton(R.drawable.ic_sysbar_recent, BUTTON_RECENTS,
		@@ -425,7 +426,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		});
		mPropertyHolders.add(new StatePropertyHolder(mRecentsButton,
		flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 && (flags & FLAG_DISABLE_RECENTS) == 0
		&& !mContext.isNavBarKidsModeActive()));
		&& !mContext.isNavBarKidsModeActive() && !mContext.isGestureNav()));

		// A11y button
		mA11yButton = addButton(R.drawable.ic_sysbar_accessibility_button, BUTTON_A11Y,