Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b1e9828 authored by Sunny Shao's avatar Sunny Shao
Browse files

Fix back key display issue in the split-screen 

- Move the back key display module into the onResume.

Fixes: 280005953
Test: manual test
Change-Id: I289c5fab678fde8345a35d7909307f153a0d812f
parent b80bbe51

src/com/android/settings/SettingsActivity.java

+12 −8
Original line number Diff line number Diff line
@@ -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