Jason Chiu 026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792

2021-11-02 02:28:16 +00:00

..

AndroidBeam.java

…

AndroidBeamEnabler.java

…

AndroidBeamPreferenceController.java

…

BaseNfcEnabler.java

…

HowItWorks.java

…

NfcDetectionPointController.java

…

NfcEnabler.java

…

NfcForegroundPreferenceController.java

…

NfcPaymentPreference.java

…

NfcPaymentPreferenceController.java

…

NfcPreferenceController.java

Add highlight menu keys for all toggle pref controllers and custom slices

2021-11-01 15:00:18 +08:00

OWNERS

…

PaymentBackend.java

Support multi-users for NFC payments

2021-08-23 16:18:08 +00:00

PaymentDefaultDialog.java

PaymentDefaultDialog Could be Overlaid

2021-09-13 17:00:30 -07:00

PaymentSettings.java

…

SecureNfcEnabler.java

…

SecureNfcPreferenceController.java

Add highlight menu keys for all toggle pref controllers and custom slices

2021-11-01 15:00:18 +08:00