From 1800a9f3e7027e8ab8ffcab51715d39b126bad43 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Thu, 3 Apr 2014 19:31:07 -0700 Subject: [PATCH] Fix bug #13735413 Particular settings name changing on device orientation changes - restore the title correctly when we are restoring the Settings App Change-Id: Ibd56c52b703620e3d2b8e524e6b3caf35f3c8980 --- src/com/android/settings/SettingsActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 378a8e4cd07..03b33ef26bd 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -433,12 +433,14 @@ public class SettingsActivity extends Activity Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS); if (savedState != null) { + // We are restarting from a previous saved state; used that to initialize, instead + // of starting fresh. mSearchMenuItemExpanded = savedState.getBoolean(SAVE_KEY_SEARCH_MENU_EXPANDED); mSearchQuery = savedState.getString(SAVE_KEY_SEARCH_QUERY); - // We are restarting from a previous saved state; used that to - // initialize, instead of starting fresh. - mInitialTitle = getTitle(); + final String initialTitle = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT_TITLE); + mInitialTitle = (initialTitle != null) ? initialTitle : getTitle(); + setTitle(mInitialTitle); ArrayList
headers = savedState.getParcelableArrayList(SAVE_KEY_HEADERS); if (headers != null) {