PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 4950070: correct title in Settings"

Browse Source
This commit is contained in:
Gilles Debunne
2011-06-28 11:38:42 -07:00
committed by Android (Google) Code Review
parent 083dd99de5 3661b62c99
commit ced7c03a11
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/Settings.java
View File

@@ -81,7 +81,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mInLocalHeaderSwitch = false; mInLocalHeaderSwitch = false;
if (isMultiPane()) { if (!onIsHidingHeaders() && onIsMultiPane()) {
highlightHeader(); highlightHeader();
// Force the title so that it doesn't get overridden by a direct launch of // Force the title so that it doesn't get overridden by a direct launch of
// a specific settings screen. // a specific settings screen.
@@ -193,7 +193,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
// If it is not launched from history, then reset to top-level // If it is not launched from history, then reset to top-level
if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0 if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
&& mFirstHeader != null && isMultiPane()) { && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
switchToHeaderLocal(mFirstHeader); switchToHeaderLocal(mFirstHeader);
} }
} }