commit ced7c03a11f202aeb08464d457bd50255bca95a6
author Gilles Debunne <debunne@google.com> Tue Jun 28 11:38:42 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 11:38:42 2011 -0700
tree 15fa62376b51501882f0301ed93529e7614604ba
parent 083dd99de5da5e534b2b47659b0f3c8a6c4857fd
parent 3661b62c99cf4db620043d8189d004ffa7f84c41

Merge "Bug 4950070: correct title in Settings"

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 8badf85..bca5e46 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -81,7 +81,7 @@
         super.onCreate(savedInstanceState);
         mInLocalHeaderSwitch = false;
 
-        if (isMultiPane()) {
+        if (!onIsHidingHeaders() && onIsMultiPane()) {
             highlightHeader();
             // Force the title so that it doesn't get overridden by a direct launch of
             // a specific settings screen.
@@ -193,7 +193,7 @@
 
         // If it is not launched from history, then reset to top-level
         if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
-                && mFirstHeader != null && isMultiPane()) {
+                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
             switchToHeaderLocal(mFirstHeader);
         }
     }