From 72aa19d1a541b01e9cc7bebd0650f5d2b5f58d58 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 9 Dec 2010 06:07:12 -0800
Subject: [PATCH] Keep the settings title as "Settings" even if launching a
 shortcut.

Handle clicks on Settings icon in top-left.
Also fix a bug where Tethering settings was changing the title.
---
 src/com/android/settings/Settings.java                    | 8 ++++++--
 src/com/android/settings/TetherSettings.java              | 2 ++
 .../android/settings/accounts/ManageAccountsSettings.java | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a47fa56278a..09584ad99ca 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -49,8 +49,12 @@ public class Settings extends PreferenceActivity {
         getMetaData();
         super.onCreate(savedInstanceState);
 
-        // TODO: Do this only if 2-pane mode
-        highlightHeader();
+        if (!onIsHidingHeaders() && onIsMultiPane()) {
+            highlightHeader();
+            // Force the title so that it doesn't get overridden by a direct launch of
+            // a specific settings screen.
+            setTitle(R.string.settings_label);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index f632a02ce7c..bc27dc025c0 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -131,6 +131,7 @@ public class TetherSettings extends SettingsPreferenceFragment {
                 mBluetoothSettings.setEnabled(false);
             }
         }
+        /* Don't change the title for two-pane settings
         if (wifiAvailable && usbAvailable && bluetoothAvailable){
             activity.setTitle(R.string.tether_settings_title_all);
         } else if (wifiAvailable && usbAvailable){
@@ -146,6 +147,7 @@ public class TetherSettings extends SettingsPreferenceFragment {
         } else {
             activity.setTitle(R.string.tether_settings_title_bluetooth);
         }
+        */
         mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp);
         mView = new WebView(activity);
     }
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 8f61516c2ae..4efe62be04b 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -216,8 +216,12 @@ public class ManageAccountsSettings extends AccountPreferenceBase
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        onAddAccountClicked();
-        return true;
+        if (item.getItemId() == MENU_ADD_ACCOUNT) {
+            onAddAccountClicked();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
     }
 
     private void setBackgroundDataInt(boolean enabled) {