From b4463e650b759f29410d5a614916b97be123aa6f Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Wed, 2 Oct 2013 18:37:13 -0700 Subject: [PATCH] Fix settings title Change-Id: I203c577693700ef60197800632e8c33bc552ef5f --- .../accessibility/ToggleFeaturePreferenceFragment.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 602432787f..482ea70bf3 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -48,10 +48,6 @@ public abstract class ToggleFeaturePreferenceFragment protected CharSequence mSettingsTitle; protected Intent mSettingsIntent; - // TODO: Showing sub-sub fragment does not handle the activity title - // so we do it but this is wrong. Do a real fix when there is time. - private CharSequence mOldActivityTitle; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -97,9 +93,6 @@ public abstract class ToggleFeaturePreferenceFragment @Override public void onDestroyView() { getActivity().getActionBar().setCustomView(null); - if (mOldActivityTitle != null) { - getActivity().getActionBar().setTitle(mOldActivityTitle); - } mToggleSwitch.setOnBeforeCheckedChangeListener(null); super.onDestroyView(); } @@ -135,8 +128,7 @@ public abstract class ToggleFeaturePreferenceFragment public void setTitle(String title) { final PreferenceActivity activity = (PreferenceActivity) getActivity(); if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) { - mOldActivityTitle = getActivity().getTitle(); - getActivity().getActionBar().setTitle(title); + getActivity().setTitle(title); } } -- 2.11.0