Merge "Move NFC setting lower down the Setting's list." into gingerbread
This commit is contained in:
@@ -40,12 +40,6 @@
|
||||
android:targetClass="com.android.settings.wifi.WifiSettings" />
|
||||
</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"
|
||||
@@ -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"
|
||||
|
Reference in New Issue
Block a user