Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev am: d55579889a

am: 5350ec84c6

Change-Id: I266271d5514f03bbb77fcb8c07cb53387fb1ec39
This commit is contained in:
Lei Yu
2017-06-19 17:47:35 +00:00
committed by android-build-merger
4 changed files with 158 additions and 53 deletions

View File

@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/bluetooth_settings">
<Preference
@@ -25,6 +26,12 @@
android:key="paired_devices"
android:title="@string/bluetooth_paired_device_title"/>
<com.android.settings.DividerPreference
android:key="bt_received_files"
android:title="@string/bluetooth_show_received_files"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.FooterPreference/>
</PreferenceScreen>