diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-13 13:59:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-13 13:59:00 -0700 |
| commit | 792d43560bdbf2f9982eb918cd841672ecfcf9de (patch) | |
| tree | 23aff9cb016be551cefb97f4f054b851a3684db1 /res/xml | |
| parent | 0340371297887290d7593d7c346e422a4c9ecd1a (diff) | |
| parent | 72ce892dd99e8340fceea8ebff41c4fd38d520bd (diff) | |
| download | packages_apps_settings-792d43560bdbf2f9982eb918cd841672ecfcf9de.zip packages_apps_settings-792d43560bdbf2f9982eb918cd841672ecfcf9de.tar.gz packages_apps_settings-792d43560bdbf2f9982eb918cd841672ecfcf9de.tar.bz2 | |
Merge "Move NFC setting lower down the Setting's list." into gingerbread
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 9116b7f..620472d 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -41,12 +41,6 @@ </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" @@ -82,6 +76,12 @@ android:targetClass="com.android.settings.vpn.VpnSettings" /> </PreferenceScreen> + <CheckBoxPreference + android:key="toggle_nfc" + android:title="@string/nfc_quick_toggle_title" + android:summary="@string/nfc_quick_toggle_summary" + android:persistent="false" /> + <PreferenceScreen android:title="@string/network_settings_title" android:summary="@string/network_settings_summary" |