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: Iad0129b7d3628cc2ddbe0510f855c4861bf3f99a
This commit is contained in:
Eric Sandness
2020-03-23 08:19:15 +00:00
committed by Automerger Merge Worker
parent cc337985fc 6d9451891a
commit a4ad84f5e5
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);
}
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);