diff options
| author | Jeff Hamilton <jham@android.com> | 2011-09-21 16:44:36 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-09-22 12:35:55 -0500 |
| commit | 3d670de5ce9180e0a75d0884832c4714cb56e1b5 (patch) | |
| tree | 2e41eb2d978f3a1fd6e10c36bc1fe64b8c6e11ee /res/xml | |
| parent | 7c430090c9a5033ad5ee91e968dab1618cf5eed3 (diff) | |
| download | packages_apps_Settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.zip packages_apps_Settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.tar.gz packages_apps_Settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.tar.bz2 | |
Bring back the Android Beam settings panel.
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 7b361f2..134461d 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -36,8 +36,14 @@ <CheckBoxPreference android:key="toggle_nfc" android:title="@string/nfc_quick_toggle_title" + android:summary="@string/nfc_quick_toggle_summary" android:persistent="false" /> + <PreferenceScreen + android:fragment="com.android.settings.nfc.AndroidBeam" + android:key="android_beam_settings" + android:title="@string/android_beam_settings_title" /> + <CheckBoxPreference android:key="toggle_wifi_p2p" android:title="@string/wifi_p2p_settings_title" |