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

Bug 4950070: correct title in Settings

Browse Source 
isMultiPane does not seem to be adequate for these tests.
It actually may have to be changed...

Change-Id: I23ddca31bb0324c1473f1a7048db3d6271583414
This commit is contained in:
Gilles Debunne
2011-06-27 11:19:16 -07:00
parent 127757637b
commit 3661b62c99
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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);
} }
} }
@@ -211,7 +211,9 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
public Intent getIntent() { public Intent getIntent() {
Intent superIntent = super.getIntent(); Intent superIntent = super.getIntent();
String startingFragment = getStartingFragmentClass(superIntent); String startingFragment = getStartingFragmentClass(superIntent);
if (startingFragment != null && !isMultiPane()) { // This is called from super.onCreate, isMultiPane() is not yet reliable
// Do not use onIsHidingHeaders either, which relies itself on this method
if (startingFragment != null && !onIsMultiPane()) {
Intent modIntent = new Intent(superIntent); Intent modIntent = new Intent(superIntent);
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment);
Bundle args = superIntent.getExtras(); Bundle args = superIntent.getExtras();