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

Merge "Only enable up button if device is provisioned"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-02 20:08:43 +00:00
committed by Android (Google) Code Review
parent 6bfcba78f4 e226b38409
commit fcb3d8d0b9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,8 +308,9 @@ public class SettingsActivity extends SettingsDrawerActivity
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
if (actionBar != null) { if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true); boolean deviceProvisioned = Utils.isDeviceProvisioned(this);
actionBar.setHomeButtonEnabled(true); actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
actionBar.setHomeButtonEnabled(deviceProvisioned);
actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard); actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
} }
mSwitchBar = findViewById(R.id.switch_bar); mSwitchBar = findViewById(R.id.switch_bar);