summaryrefslogtreecommitdiff
path: root/Settings/res
diff options
context:
space:
mode:
Diffstat (limited to 'Settings/res')
-rw-r--r--Settings/res/values/config.xml12
-rw-r--r--Settings/res/values/strings.xml12
2 files changed, 14 insertions, 10 deletions
diff --git a/Settings/res/values/config.xml b/Settings/res/values/config.xml
index 879568098..bddfb4817 100644
--- a/Settings/res/values/config.xml
+++ b/Settings/res/values/config.xml
@@ -162,8 +162,12 @@
<bool name="config_energy_mode_unrestricted_enabled">false</bool>
- <!-- Enable the physical device button integration with the find my remote feature.
- Note that this variable only controls the default implementation, which is used if
- strings/connected_devices_slice_uri is empty. -->
- <bool name="config_fmr_integration_enabled">false</bool>
+ <!--
+ Whether the ATV integrates the Find My Remote functionality with the on-device button.
+ If it does, the integration should respect the value of
+ Settings.Global.fmr_on_physical_button_enabled setting.
+ Note that this variable only controls the default implementation, which is used if
+ strings/connected_devices_slice_uri is empty.
+ -->
+ <bool name="config_find_my_remote_integration_enabled">false</bool>
</resources>
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index 1434e0649..93f8dcea2 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -2848,11 +2848,11 @@
<string name="energy_modes_confirmation_title">Enable \"<xliff:g id="energyModeName" example="Essential network features">%s</xliff:g>\"</string>
<!-- Title for find my remote preference -->
- <string name="settings_fmr_title">Find my remote</string>
+ <string name="settings_find_my_remote_title">Find my remote</string>
<!-- Description for find my remote preference -->
- <string name="settings_fmr_description">Play a sound to locate your Google TV remote if it\'s misplaced</string>
- <string name="fmr_slice_description">Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote.</string>
- <string name="fmr_suppress_title">Disable the physical button</string>
- <string name="fmr_suppress_subtitle">Pressing your device button will no longer play a sound on your remote</string>
- <string name="fmr_play_sound">Play sound</string>
+ <string name="settings_find_my_remote_description">Play a sound to locate your Google TV remote if it\'s misplaced</string>
+ <string name="find_my_remote_slice_description">Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote.</string>
+ <string name="find_my_remote_integration_title" translatable="false">@string/settings_find_my_remote_title</string>
+ <string name="find_my_remote_integration_hint">When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s misplaced.</string>
+ <string name="find_my_remote_play_sound">Play sound</string>
</resources>