Move BT, NFC preference out of Connection Preference, To Connected devices page. Because NFC and Android Beam are controlled by the same controller, Create each controller for those preference and leave the sharing part. Change-Id: I8bc303a5f487de9c667487119b49e1e4130aa80c Fixes: 72458929 Test: manually test, make RunSettingsRoboTests
56 lines
2.2 KiB
XML
56 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="connected_devices_advanced_screen"
|
|
android:title="@string/connected_device_connections_title">
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:fragment="com.android.settings.nfc.AndroidBeam"
|
|
android:key="android_beam_settings"
|
|
android:title="@string/android_beam_settings_title"
|
|
android:icon="@drawable/ic_android"
|
|
android:order="-4"/>
|
|
|
|
<SwitchPreference
|
|
android:key="bluetooth_on_while_driving"
|
|
android:title="@string/bluetooth_on_while_driving_pref"
|
|
android:icon="@drawable/ic_settings_bluetooth"
|
|
android:summary="@string/bluetooth_on_while_driving_summary"
|
|
settings:controller="com.android.settings.connecteddevice.BluetoothOnWhileDrivingPreferenceController"
|
|
android:order="-2"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="connected_device_printing"
|
|
android:title="@string/print_settings"
|
|
android:summary="@string/summary_placeholder"
|
|
android:icon="@drawable/ic_settings_print"
|
|
android:fragment="com.android.settings.print.PrintSettingsFragment"
|
|
android:order="-1"/>
|
|
|
|
<Preference
|
|
android:key="bt_received_files"
|
|
android:icon="@drawable/ic_folder_vd_theme_24"
|
|
android:title="@string/bluetooth_show_received_files"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="dashboard_tile_placeholder"
|
|
android:order="50"/>
|
|
|
|
</PreferenceScreen>
|