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

Merge "Refactor nfc preference controller" into pi-dev

Browse Source 
am: 2357c1cd84

Change-Id: I82c793a393ec8bd92f409743173ec79a8ba0387b
This commit is contained in:
Chihhang Chuang
2018-05-24 16:35:26 -07:00
committed by android-build-merger
parent 75ffd61ee3 2357c1cd84
commit 6c1c1a6a50
19 changed files with 471 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/connected_devices_advanced.xml
View File

@@ -32,12 +32,14 @@
android:title="@string/nfc_quick_toggle_title"
android:icon="@drawable/ic_nfc"
android:summary="@string/nfc_quick_toggle_summary"
settings:controller="com.android.settings.nfc.NfcPreferenceController"
android:order="-7"/>
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.nfc.AndroidBeam"
android:key="android_beam_settings"
android:title="@string/android_beam_settings_title"
settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
android:icon="@drawable/ic_android"
android:order="-6"/>