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

Commit 3ae92de3 authored by Kaiqiang Wang's avatar Kaiqiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Audio Description preference updates according to IC reviewing: 1)...

Merge "Audio Description preference updates according to IC reviewing: 1) Update audio description preference summary as the Legal team    suggestion as b/194376036#comment6 2) Move audio description preference item under "Audio" category as the    UX team suggestions as b/194376037#comment#9" into tm-dev am: 58ab365a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17037304

Change-Id: I1d2b9da188c83fe94e6f313aebea4434e2a3c964
parents 2a80f465 58ab365a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -5619,10 +5619,10 @@
    <!-- Title for the accessibility audio adjustment page. [CHAR LIMIT=50] -->
    <string name="accessibility_audio_adjustment_title">Audio adjustment</string>
    <!-- Title for control audio description preference. [CHAR LIMIT=50] -->
    <string name="accessibility_toggle_audio_description_preference_title">Audio Description</string>
    <string name="accessibility_toggle_audio_description_preference_title">Audio description</string>
    <!-- Summary for accessibility preference for audio description when need
    audio description in adopted apps. [CHAR_LIMIT=NONE] -->
    <string name="accessibility_audio_description_summary">Select audio sound track with audio description by default</string>
    <string name="accessibility_audio_description_summary">Hear a description of what\u2019s happening on screen in supported movies and shows</string>
    <!-- List of synonyms used in the settings search bar to find the "Audio Description. [CHAR LIMIT=NONE] -->
    <string name="keywords_audio_description">audio description, audio, description, low vision,</string>
+10 −10
Original line number Diff line number Diff line
@@ -69,16 +69,6 @@
            settings:keywords="@string/keywords_magnification"
            settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>

        <SwitchPreference
            android:key="toggle_audio_description"
            android:persistent="false"
            android:icon="@drawable/ic_audio_description"
            android:summary="@string/accessibility_audio_description_summary"
            android:title="@string/accessibility_toggle_audio_description_preference_title"
            settings:keywords="@string/keywords_audio_description"
            settings:searchable="true"
            settings:controller="com.android.settings.accessibility.AudioDescriptionPreferenceController"/>

    </PreferenceCategory>

    <PreferenceCategory
@@ -150,6 +140,16 @@
        android:persistent="false"
        android:title="@string/audio_category_title">

        <SwitchPreference
            android:key="toggle_audio_description"
            android:persistent="false"
            android:icon="@drawable/ic_audio_description"
            android:summary="@string/accessibility_audio_description_summary"
            android:title="@string/accessibility_toggle_audio_description_preference_title"
            settings:keywords="@string/keywords_audio_description"
            settings:searchable="true"
            settings:controller="com.android.settings.accessibility.AudioDescriptionPreferenceController"/>

        <Preference
            android:key="hearing_aid_preference"
            android:icon="@drawable/ic_hearing_aid"