PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread

Browse Source 
Merge commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c'

* commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c':
  Move NFC setting lower down the Setting's list.
This commit is contained in:
Nick Pelly
2010-10-15 08:31:26 -07:00
committed by Android Git Automerger
parent 0ceae1cbdc da08f31f79
commit a3757ca27a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/wireless_settings.xml
View File

@@ -38,12 +38,6 @@
android:summary="@string/wifi_settings_summary" > android:summary="@string/wifi_settings_summary" >
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference
android:key="toggle_nfc"
android:title="@string/nfc_quick_toggle_title"
android:summary="@string/nfc_quick_toggle_summary"
android:persistent="false" />
<CheckBoxPreference <CheckBoxPreference
android:key="toggle_bluetooth" android:key="toggle_bluetooth"
android:title="@string/bluetooth_quick_toggle_title" android:title="@string/bluetooth_quick_toggle_title"
@@ -71,6 +65,12 @@
android:summary="@string/vpn_settings_summary" > android:summary="@string/vpn_settings_summary" >
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference
android:key="toggle_nfc"
android:title="@string/nfc_quick_toggle_title"
android:summary="@string/nfc_quick_toggle_summary"
android:persistent="false" />
<PreferenceScreen <PreferenceScreen
android:title="@string/network_settings_title" android:title="@string/network_settings_title"
android:summary="@string/network_settings_summary" android:summary="@string/network_settings_summary"