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/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);
}