diff options
| author | Martijn Coenen <maco@google.com> | 2015-07-29 07:54:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 07:54:29 +0000 |
| commit | 50184147fc35d5d441ae24661531819cc6cc025f (patch) | |
| tree | 9e057f20c7c78ce1feb2eaef1ced612274132e41 /packages/SettingsProvider/res | |
| parent | a7b4d6dc1017bcb2e6144fa5eb9d2ed07093ffa8 (diff) | |
| parent | 7ab4b7fd500c3c21b0329faa29e74eac4ef638af (diff) | |
| download | frameworks_base-50184147fc35d5d441ae24661531819cc6cc025f.zip frameworks_base-50184147fc35d5d441ae24661531819cc6cc025f.tar.gz frameworks_base-50184147fc35d5d441ae24661531819cc6cc025f.tar.bz2 | |
Merge "Resource for setting default NFC payment component." into mnc-dev
Diffstat (limited to 'packages/SettingsProvider/res')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 3f0d71c..1cd2908 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -210,4 +210,6 @@ <!-- Default state of tap to wake --> <bool name="def_double_tap_to_wake">true</bool> + <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> + <string name="def_nfc_payment_component"></string> </resources> |