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

Commit dd032d37 authored by Edgar Wang's avatar Edgar Wang
Browse files

Update inclusive language for Accessibility Settings 

Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I67032d4beb7c8ae6b5a3271ea75ca38be4351484
parent f5348116

res/layout/restricted_preference_widget_master_switch.xml→res/layout/restricted_preference_widget_primary_switch.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <include layout="@layout/restricted_icon"/>



    <include layout="@layout/preference_widget_master_switch"/>

    <include layout="@layout/preference_widget_primary_switch"/>

</merge>
 
 No newline at end of file

res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ 
        <!--

        <item>com.example.package.first/com.example.class.FirstService</item>

        <item>com.example.package.second/com.example.class.SecondService</item>

        <item>toggle_master_mono</item>

        <item>seekbar_master_balance</item>

        <item>toggle_primary_mono</item>

        <item>seekbar_primary_balance</item>

        <item>...</item>

        -->

    </string-array>

res/values/strings.xml

+11 −11
Original line number Diff line number Diff line
@@ -5045,12 +5045,12 @@ 
    <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>

    <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->

    <string name="accessibility_disable_animations">Remove animations</string>

    <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->

    <string name="accessibility_toggle_master_mono_title">Mono audio</string>

    <!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->

    <string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>

    <!-- Title for the accessibility preference for primary mono. [CHAR LIMIT=35] -->

    <string name="accessibility_toggle_primary_mono_title">Mono audio</string>

    <!-- Summary for the accessibility preference for primary mono. [CHAR LIMIT=50] -->

    <string name="accessibility_toggle_primary_mono_summary">Combine channels when playing audio</string>

    <!-- Title for the accessibility preference for master balance. [CHAR LIMIT=35] -->

    <string name="accessibility_toggle_master_balance_title">Audio balance</string>

    <string name="accessibility_toggle_primary_balance_title">Audio balance</string>

    <!-- 'Left' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->

    <string name="accessibility_toggle_master_balance_left_label">Left</string>

    <!-- 'Right' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
@@ -5127,13 +5127,13 @@ 
    <!-- Used in the accessibility service settings to control turning on/off the service entirely -->

    <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_master_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->

    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>

    <!-- Title for Captions settings screen to control turning on/off the feature entirely -->

    <string name="accessibility_caption_master_switch_title">Show captions</string>

    <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->

    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>

    <!-- Title for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->

    <string name="accessibility_caption_primary_switch_title">Show captions</string>

    <!-- Summary for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->

    <string name="accessibility_caption_master_switch_summary">For supported app only</string>

    <string name="accessibility_caption_primary_switch_summary">For supported app only</string>

    <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->

    <string name="captioning_caption_appearance_title">Caption size and style</string>

    <!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->

res/xml/accessibility_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -158,16 +158,16 @@ 
            settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>



        <SwitchPreference

            android:key="toggle_master_mono"

            android:key="toggle_primary_mono"

            android:persistent="false"

            android:summary="@string/accessibility_toggle_master_mono_summary"

            android:title="@string/accessibility_toggle_master_mono_title"

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

            android:summary="@string/accessibility_toggle_primary_mono_summary"

            android:title="@string/accessibility_toggle_primary_mono_title"

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



        <com.android.settings.accessibility.BalanceSeekBarPreference

            android:key="seekbar_master_balance"

            android:key="seekbar_primary_balance"

            android:persistent="false"

            android:title="@string/accessibility_toggle_master_balance_title"/>

            android:title="@string/accessibility_toggle_primary_balance_title"/>



        <Preference

            android:key="hearing_aid_preference"