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

Commit aea33ee8 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Fix '<b>' did not get bold in HearingDevice footer." into main

parents a2178178 9b4575a5

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5671,8 +5671,8 @@ 
    <!-- Title for accessibility hearing device page footer. [CHAR LIMIT=40] -->

    <string name="accessibility_hearing_device_about_title">About hearing devices</string>

    <!-- Description for text in accessibility hearing aids footer. [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=7451899224828040581] -->

    <string name="accessibility_hearing_device_footer_summary">To find other hearing devices that aren’t supported by ASHA or LE Audio, tap <b>Pair new device</b> > <b>See more devices</b></string>

    <!-- Description for text in accessibility hearing aids footer. Replace '>' to 'then' for TTS to announce. [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=7451899224828040581] -->

    <string name="accessibility_hearing_device_footer_summary"><![CDATA[To find other hearing devices that aren’t supported by ASHA or LE Audio, tap <b>Pair new device</b> > <b>See more devices</b>]]></string>

    <!-- Content description for text in accessibility hearing aids footer to be announce. Replace '>' to 'then' compare to non tts version. [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=7451899224828040581] -->

    <string name="accessibility_hearing_device_footer_summary_tts">To find other hearing devices that aren’t supported by ASHA or LE Audio, tap <b>Pair new device</b> then <b>See more devices</b></string>

    <!-- Title for the pair hearing device page. [CHAR LIMIT=25] -->

    <string name="accessibility_hearing_device_pairing_page_title">Pair hearing device</string>

res/xml/accessibility_hearing_aids.xml

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 


    <com.android.settings.accessibility.AccessibilityFooterPreference

        android:key="hearing_device_footer"

        android:title="@string/accessibility_hearing_device_footer_summary"

        android:selectable="false"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.HearingDeviceFooterPreferenceController"/>

src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import android.content.Context;

import android.text.Html;



import androidx.annotation.NonNull;

import androidx.preference.PreferenceScreen;
@@ -42,6 +43,13 @@ public class HearingDeviceFooterPreferenceController extends 


        final AccessibilityFooterPreference footerPreference =

                screen.findPreference(getPreferenceKey());

        // We use html tag inside footer string, so it is better to load from html to have better

        // html tag support.

        final CharSequence title = Html.fromHtml(

                mContext.getString(R.string.accessibility_hearing_device_footer_summary),

                Html.FROM_HTML_MODE_COMPACT, /* imageGetter= */ null, /* tagHandler= */ null);

        footerPreference.setTitle(title);



        // Need to update contentDescription string to announce "than" rather than ">"

        final String summaryTts = mContext.getString(

                R.string.accessibility_hearing_device_footer_summary_tts);