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

Merge "Fix back key display issue in the split-screen"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-26 06:01:24 +00:00
committed by Android (Google) Code Review
parent 4ce984873e 4b1e982898
commit 96e8030453
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,14 +330,6 @@ public class SettingsActivity extends SettingsBaseActivity
launchSettingFragment(initialFragmentName, intent); launchSettingFragment(initialFragmentName, intent);
} }
final boolean isActionBarButtonEnabled = isActionBarButtonEnabled(intent);
final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(isActionBarButtonEnabled);
actionBar.setHomeButtonEnabled(isActionBarButtonEnabled);
actionBar.setDisplayShowTitleEnabled(true);
}
mMainSwitch = findViewById(R.id.switch_bar); mMainSwitch = findViewById(R.id.switch_bar);
if (mMainSwitch != null) { if (mMainSwitch != null) {
mMainSwitch.setMetricsCategory(lookupMetricsCategory()); mMainSwitch.setMetricsCategory(lookupMetricsCategory());
@@ -395,6 +387,17 @@ public class SettingsActivity extends SettingsBaseActivity
} }
} }
private void setActionBarStatus() {
final boolean isActionBarButtonEnabled = isActionBarButtonEnabled(getIntent());
final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(isActionBarButtonEnabled);
actionBar.setHomeButtonEnabled(isActionBarButtonEnabled);
actionBar.setDisplayShowTitleEnabled(true);
}
}
private boolean isActionBarButtonEnabled(Intent intent) { private boolean isActionBarButtonEnabled(Intent intent) {
if (WizardManagerHelper.isAnySetupWizard(intent)) { if (WizardManagerHelper.isAnySetupWizard(intent)) {
return false; return false;
@@ -680,6 +683,7 @@ public class SettingsActivity extends SettingsBaseActivity
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
setActionBarStatus();
mDevelopmentSettingsListener = new BroadcastReceiver() { mDevelopmentSettingsListener = new BroadcastReceiver() {
@Override @Override