From b02952a5d3f68a51c10fc4ba503074f2e95cc6ec Mon Sep 17 00:00:00 2001
From: Eric Sandness <sandness@google.com>
Date: Fri, 20 Mar 2020 10:51:03 +0000
Subject: [PATCH] Make Logic For Selecting Title Layout Consistent

Align the logic for selecting between the setup and non-setup versions
of the lock screen settings title layout, with the logic used in
ChooseLockGeneric.  This means using
WizardManagerHelper.isAnySetupWizard, rather than
WizardManagerHelper.isDeviceProvisioned.

Fixes: 151552453
Test: Manually verify screens in consumer setup, enterprise setup, and
Settings app

Change-Id: I75cd9e509320b9ef9b929dd592f16e8130d80a6e
---
 src/com/android/settings/SettingsActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3883eba9ebe..1c2952a3b46 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -282,12 +282,12 @@ public class SettingsActivity extends SettingsBaseActivity
             launchSettingFragment(initialFragmentName, intent);
         }
 
-        final boolean deviceProvisioned = WizardManagerHelper.isDeviceProvisioned(this);
+        final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
 
         final ActionBar actionBar = getActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
-            actionBar.setHomeButtonEnabled(deviceProvisioned);
+            actionBar.setDisplayHomeAsUpEnabled(!isInSetupWizard);
+            actionBar.setHomeButtonEnabled(!isInSetupWizard);
             actionBar.setDisplayShowTitleEnabled(true);
         }
         mSwitchBar = findViewById(R.id.switch_bar);