diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-10 09:48:51 -0700 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-13 16:18:05 -0700 |
| commit | 6ebf8619d7f09e9642aed84310b56d9847eead94 (patch) | |
| tree | 9045fff6c5ff484519ab6c76184f4ace0afc0351 /res/xml | |
| parent | b68e0f1d7dea178231efd8a419cc18223352ba78 (diff) | |
| download | packages_apps_settings-6ebf8619d7f09e9642aed84310b56d9847eead94.zip packages_apps_settings-6ebf8619d7f09e9642aed84310b56d9847eead94.tar.gz packages_apps_settings-6ebf8619d7f09e9642aed84310b56d9847eead94.tar.bz2 | |
Fragmentize BluetoothSettings.
Add UserLeaveHintListener.java, so that the settings won't use
its implementation around Activity#onUserLeaveHint().
Also fragmentize bluetooth tethering screen.
Change-Id: Id06ae3161fbdb5854ddb7a257f464fb16ea9b089
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/tether_prefs.xml | 7 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index ac93a86..d475a14 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -38,14 +38,13 @@ android:title="@string/bluetooth_tether_checkbox_text" android:persistent="false" /> + <!-- BluetoothSettings will have extra argument to know this request is + for tethering, not for BT setting in general. --> <PreferenceScreen + android:fragment="com.android.settings.bluetooth.BluetoothSettings" android:key="bluetooth_tether_settings" android:title="@string/bluetooth_tether_settings_text" android:summary="@string/bluetooth_tether_settings_subtext" > - <intent - android:action="com.android.settings.bluetooth.action.LAUNCH_TETHER_PICKER" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.bluetooth.BluetoothSettings" /> </PreferenceScreen> <PreferenceScreen diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 3c61424..8e05e60 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -45,13 +45,10 @@ android:persistent="false" /> <PreferenceScreen + android:fragment="com.android.settings.bluetooth.BluetoothSettings" android:key="bt_settings" android:title="@string/bluetooth_settings_title" android:summary="@string/bluetooth_settings_summary"> - <intent - android:action="android.intent.action.MAIN" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.bluetooth.BluetoothSettings" /> </PreferenceScreen> <PreferenceScreen |