commit 72aa19d1a541b01e9cc7bebd0650f5d2b5f58d58
author Amith Yamasani <yamasani@google.com> Thu Dec 09 06:07:12 2010 -0800
committer Amith Yamasani <yamasani@google.com> Thu Dec 09 06:07:50 2010 -0800
tree 69c7ccd6a31132e6423f8a158c1af28ac4cde988
parent 17e9e1933055b207473b488595b2887bfcaea32e

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

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a47fa56..09584ad 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -49,8 +49,12 @@
         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

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index f632a02..bc27dc0 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -131,6 +131,7 @@
                 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 @@
         } else {
             activity.setTitle(R.string.tether_settings_title_bluetooth);
         }
+        */
         mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp);
         mView = new WebView(activity);
     }

src/com/android/settings/accounts/ManageAccountsSettings.java

diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 8f61516..4efe62b 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -216,8 +216,12 @@
 
     @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) {