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.
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