Merge "Fix back key display issue in the split-screen" (96e80304) · Commits · e / os / android_packages_apps_Settings

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