Ensure the back button is visible in SUW for simple view

Simple view is meant to provide an easier setup experience and this
means that the back button must be visible in SUW, even if the new
design choice is applied. This change adds a caveat to enable the back
button for this situation.

Fix: 396559615
Test: Enable/Disable simple view with the new theme applied and observe
the back button appear/disappear
Flag: EXEMPT bugfix

Change-Id: Ic58b5d87b2d0670c468222098a53293ae27b0206
This commit is contained in:
Saumya Prakash committed 2025-03-31 23:38:01 +00:00
1 parent 2201485e22
commit 699be36c9b
3 files changed
+24 -6

No files matched your search

@@ -344,8 +344,10 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
// Start at 1 because relevant flags are unset at init.
mOnBackgroundNavButtonColorOverrideMultiplier.value = 1;
// Potentially force the back button to be visible during setup wizard.
boolean shouldShowInSetup = !mContext.isUserSetupComplete() && !mIsExpressiveThemeEnabled;
// Potentially force the back button to be visible during setup wizard. The back button
// won't show up if the expressive theme is enabled and simple view is disabled
boolean shouldShowInSetup = !mContext.isUserSetupComplete()
&& (!mIsExpressiveThemeEnabled || mContext.isSimpleViewEnabled());
boolean isInKidsMode = mContext.isNavBarKidsModeActive();
boolean alwaysShowButtons = isThreeButtonNav || shouldShowInSetup;
@@ -987,15 +989,15 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
if (mFloatingRotationButton != null) {
mFloatingRotationButton.onConfigurationChanged(configChanges);
}
if (!mContext.isUserSetupComplete()) {
if (!mContext.isUserSetupComplete() && !ENABLE_TASKBAR_NAVBAR_UNIFICATION) {
handleSetupUi();
}
updateButtonLayoutSpacing();
}
private void handleSetupUi() {
// Setup wizard handles the UI when the expressive theme is enabled.
if (mIsExpressiveThemeEnabled) {
// Setup wizard handles the UI when the expressive theme is enabled and Simple View isn't.
if (mIsExpressiveThemeEnabled && !mContext.isSimpleViewEnabled()) {
return;
}
// Since setup wizard only has back button enabled, it looks strange to be