diff --git a/res/values/strings.xml b/res/values/strings.xml index f77c10d577c..9576c1482b7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1859,6 +1859,11 @@ NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags. + + Secure NFC + + Allow NFC Payment and Transit use only when screen is unlocked + Android Beam @@ -1866,7 +1871,7 @@ Off - Unavailable because NFC is turned off + Unavailable because NFC is turned off Android Beam diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index b5d2a999e4b..2ceceb384f0 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -44,6 +44,14 @@ android:icon="@drawable/ic_android" android:order="-6"/> + + niks = AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(RuntimeEnvironment.application); + .getNonIndexableKeys(context); assertThat(niks).contains(AdvancedConnectedDeviceDashboardFragment.KEY_BLUETOOTH); }