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

Fix back key display issue in the split-screen

Browse Source 
- Move the back key display module into the onResume.

Fixes: 280005953
Test: manual test
Change-Id: I289c5fab678fde8345a35d7909307f153a0d812f
This commit is contained in:
Sunny Shao
2023-06-19 11:17:26 +08:00
parent b80bbe519c
commit 4b1e982898
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);
}
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);
if (mMainSwitch != null) {
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) {
if (WizardManagerHelper.isAnySetupWizard(intent)) {
return false;
@@ -680,6 +683,7 @@ public class SettingsActivity extends SettingsBaseActivity
@Override
protected void onResume() {
super.onResume();
setActionBarStatus();
mDevelopmentSettingsListener = new BroadcastReceiver() {
@Override