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

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

Merge "Update the Fast Pair integration wording." into main

parents f11e1666 f4e20cbf

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -257,6 +257,8 @@ 
    <string name="connected_device_other_device_title">Other devices</string>

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

    <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>

    <!-- 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="TODO(296507968): Placeholder"

        android:title="@string/connected_device_fast_pair_device_title"

        settings:controller=

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

res/xml/fast_pair_devices.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 


<PreferenceScreen

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

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

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

    android:title="@string/connected_device_fast_pair_device_title">



    <PreferenceCategory

        android:key="fast_pair_device_list"