am 1fa2ab82: Merge "Fix missing title for WiFi Advanced settings." into honeycomb

* commit '1fa2ab82fb798854c500162d205c759d7cf6c24e': Fix missing title for WiFi Advanced settings.
2011-01-25 21:43:46 -08:00
parent e6df78714d 1fa2ab82fb
commit ff04e6ac86
1 changed files with 9 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -265,7 +265,15 @@ public class WifiSettings extends SettingsPreferenceFragment
                }
                return true;
            case MENU_ID_ADVANCED:
+                if (getActivity() instanceof PreferenceActivity) {
+                    ((PreferenceActivity) getActivity()).startPreferencePanel(
+                            AdvancedSettings.class.getCanonicalName(),
+                            null,
+                            R.string.wifi_advanced_titlebar, null,
+                            this, 0);
+                } else {
                    startFragment(this, AdvancedSettings.class.getCanonicalName(), -1, null);
+                }
                return true;
        }
        return super.onOptionsItemSelected(item);