PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a

Browse Source 
Change-Id: Ie8144a556fa767e274ececbeb58f87844cdd31a9
This commit is contained in:
Eric Sandness
2020-03-23 08:18:48 +00:00
committed by Automerger Merge Worker
parent db6759d985 6d9451891a
commit 0bf7413ff2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SettingsActivity.java
View File

@@ -282,12 +282,12 @@ public class SettingsActivity extends SettingsBaseActivity
launchSettingFragment(initialFragmentName, intent); launchSettingFragment(initialFragmentName, intent);
} }
final boolean deviceProvisioned = WizardManagerHelper.isDeviceProvisioned(this); final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
final ActionBar actionBar = getActionBar(); final ActionBar actionBar = getActionBar();
if (actionBar != null) { if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned); actionBar.setDisplayHomeAsUpEnabled(!isInSetupWizard);
actionBar.setHomeButtonEnabled(deviceProvisioned); actionBar.setHomeButtonEnabled(!isInSetupWizard);
actionBar.setDisplayShowTitleEnabled(true); actionBar.setDisplayShowTitleEnabled(true);
} }
mSwitchBar = findViewById(R.id.switch_bar); mSwitchBar = findViewById(R.id.switch_bar);