Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3df78993 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "Update the wording for subsequent pair devices in Settings." into main

parents 5ccd4fee 8e38bd0b

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ 
    <string name="connected_device_saved_title">Saved devices</string>

    <!-- Title for fast pair device group [CHAR LIMIT=none]-->

    <string name="connected_device_fast_pair_device_title">Associated with account</string>

    <!-- Title for previously associated fast pair device group [CHAR LIMIT=none]-->

    <string name="connected_device_previously_associated_fast_pair_device_title">Previously used with account</string>

    <!-- Summary for preference to add a device [CHAR LIMIT=none]-->

    <string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>

    <!-- Title for other connection preferences [CHAR LIMIT=none]-->

res/xml/connected_devices.xml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


    <PreferenceCategory

        android:key="fast_pair_devices"

        android:title="@string/connected_device_fast_pair_device_title"

        android:title="@string/connected_device_previously_associated_fast_pair_device_title"

        settings:controller=

            "com.android.settings.connecteddevice.fastpair.FastPairDevicePreferenceController">

res/xml/fast_pair_devices.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/connected_device_fast_pair_device_title">

    android:title="@string/connected_device_previously_associated_fast_pair_device_title">



    <PreferenceCategory

        android:key="fast_pair_device_list"