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

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

Browse Source 
Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp

* commit '792d43560bdbf2f9982eb918cd841672ecfcf9de':
  Move NFC setting lower down the Setting's list.
This commit is contained in:
Nick Pelly
2010-10-13 14:23:05 -07:00
committed by Android Git Automerger
parent 836b4297cc 792d43560b
commit da08f31f79
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

@@ -40,12 +40,6 @@
android:targetClass="com.android.settings.wifi.WifiSettings" /> android:targetClass="com.android.settings.wifi.WifiSettings" />
</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"
@@ -82,6 +76,12 @@
android:targetClass="com.android.settings.vpn.VpnSettings" /> android:targetClass="com.android.settings.vpn.VpnSettings" />
</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"