diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-13 14:23:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 14:23:05 -0700 |
| commit | da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c (patch) | |
| tree | ff2997a08fe991a6ad995b4c7573d1de73c90db5 /res/xml | |
| parent | 836b4297ccde47ae6356b2a805394d3285368144 (diff) | |
| parent | 792d43560bdbf2f9982eb918cd841672ecfcf9de (diff) | |
| download | packages_apps_settings-da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c.zip packages_apps_settings-da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c.tar.gz packages_apps_settings-da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c.tar.bz2 | |
am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread
Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp
* commit '792d43560bdbf2f9982eb918cd841672ecfcf9de':
Move NFC setting lower down the Setting's list.
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" |