diff options
| author | Nick Pelly <npelly@google.com> | 2010-09-29 12:10:35 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-09-29 12:10:35 -0700 |
| commit | d83aaf28bce5472564ddfb6f3d8660459c826d17 (patch) | |
| tree | 04e4a865162cc223e9d409e2f80d2c9a343caeba /res/xml/wireless_settings.xml | |
| parent | 5809d33296d60f54c7e93de2f45bd84579f70449 (diff) | |
| parent | 1ff9ad3fb4947c458eaf4a99f0cd32834ee53943 (diff) | |
| download | packages_apps_Settings-d83aaf28bce5472564ddfb6f3d8660459c826d17.zip packages_apps_Settings-d83aaf28bce5472564ddfb6f3d8660459c826d17.tar.gz packages_apps_Settings-d83aaf28bce5472564ddfb6f3d8660459c826d17.tar.bz2 | |
resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
Diffstat (limited to 'res/xml/wireless_settings.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 f6d0012..27d00c0 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -39,6 +39,12 @@ </PreferenceScreen> <CheckBoxPreference + android:key="toggle_nfc" + android:title="@string/nfc_quick_toggle_title" + android:summary="@string/nfc_quick_toggle_summary" + android:persistent="false" /> + + <CheckBoxPreference android:key="toggle_bluetooth" android:title="@string/bluetooth_quick_toggle_title" android:summary="@string/bluetooth_quick_toggle_summary" |