Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview

...and then exit the Settings App

- fix the way we manage the Fragment BackStack
- revert back ChooseLockGeneric to be a PreferenceActivity

Change-Id: I3c366b4be606e2e211facd0299b9a2de5cc6ea79
This commit is contained in:
Fabrice Di Meglio
2014-02-07 18:53:14 -08:00
parent c94122a199
commit 4cc95a53c2
3 changed files with 126 additions and 153 deletions

View File

@@ -328,14 +328,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
mToggleSwitch.setCheckedInternal(enabled);
// Title.
SettingsActivity activity = (SettingsActivity) getActivity();
if (!activity.onIsHidingHeaders()) {
mOldActivityTitle = getActivity().getTitle();
String title = arguments.getString(PrintSettingsFragment.EXTRA_TITLE);
getActivity().getActionBar().setTitle(title);
}
// Settings title and intent.
String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);
String settingsComponentName = arguments.getString(