summaryrefslogtreecommitdiffstats
path: root/res/xml/wireless_settings.xml
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2010-08-25 11:58:37 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2010-08-25 16:03:33 -0700
commit9c8bde576ab18fcfe653587f3e63604430c8791c (patch)
treeef650a8f840c62f0e243c796bdd6800e068219c1 /res/xml/wireless_settings.xml
parente742d42d5435a633241715428b3715ff4a30f0f8 (diff)
downloadpackages_apps_Settings-9c8bde576ab18fcfe653587f3e63604430c8791c.zip
packages_apps_Settings-9c8bde576ab18fcfe653587f3e63604430c8791c.tar.gz
packages_apps_Settings-9c8bde576ab18fcfe653587f3e63604430c8791c.tar.bz2
Fragmentize WifiSettings.
- Add button bar feature toward SettingsPreferenceFragment, which has existed in PreferenceActivity and has been used (probably) only by Settings app. - super.onActivityCreated() is not called at the beggining of WifiSettings#onActivityCreated(), the parent method assumes the child should have prepared PreferenceScreen, while WifiSettings cannot do until the parent Activity is ready. - Call SetHasOptionMenu() should be called AFTER the parent Activity is ready. It is not documented, so it would be better to file another bug. - Add exception to proguard... Change-Id: Iebd27f0cb0abdbee9b4b1cc9b00f4bf127f7815d
Diffstat (limited to 'res/xml/wireless_settings.xml')
-rw-r--r--res/xml/wireless_settings.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 66508e7..1a8c1e7 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -32,13 +32,10 @@
android:persistent="false" />
<PreferenceScreen
+ android:fragment="com.android.settings.wifi.WifiSettings"
android:key="wifi_settings"
android:title="@string/wifi_settings"
android:summary="@string/wifi_settings_summary" >
- <intent
- android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.wifi.WifiSettings" />
</PreferenceScreen>
<CheckBoxPreference