Merge Tap & Pay settings entries with NFC

Bug: 142231537
Test: make -j42 RunSettingsRoboTests
Change-Id: I54ea0cdf711f2c381f5bba8575fc22bd6329f3c6
This commit is contained in:
robertluo
2020-02-03 14:45:46 +08:00
parent 0a832ffe10
commit 81c79bb239
12 changed files with 536 additions and 23 deletions

View File

@@ -100,13 +100,6 @@
android:fragment="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess"
settings:controller="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsController" />
<Preference
android:key="default_payment_app"
android:title="@string/nfc_payment_settings_title"
android:fragment="com.android.settings.nfc.PaymentSettings"
settings:keywords="@string/keywords_default_payment_app"
settings:controller="com.android.settings.applications.specialaccess.DefaultPaymentSettingsPreferenceController" />
<Preference
android:key="data_saver"
android:title="@string/unrestricted_data_saver"