commit b02952a5d3f68a51c10fc4ba503074f2e95cc6ec
author Eric Sandness <sandness@google.com> Fri Mar 20 10:51:03 2020 +0000
committer Eric Sandness <sandness@google.com> Mon Mar 23 06:25:07 2020 +0000
tree 522f2d52beab38d25e5af614290ce26a02419a22
parent 31315e417220109f4e2877d07bf6ab5c154ceae3

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

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3883eba..1c2952a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -282,12 +282,12 @@
             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);