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

Commit e5712565 authored by menghanli's avatar menghanli
Browse files

Unify the caption preference class naming

Bug: 197695932
Test: make RunSettingsRoboTests
Change-Id: Ice244442ad21e6d9f006d488992e9f58cf5c8fb0
parent 0494c454
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2110,7 +2110,7 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.accessibility.CaptionPropertiesFragment" />
                android:value="com.android.settings.accessibility.CaptioningPropertiesFragment" />
            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
                       android:value="@string/menu_key_accessibility"/>
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@

    <dimen name="rect_button_radius">8dp</dimen>

    <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
    <dimen name="caption_preview_text_size">48dp</dimen>
    <!-- Default text size for captioning preview samples. Uses dp rather than sp because captions are not scaled. -->
    <dimen name="captioning_preview_text_size">48dp</dimen>

    <!-- ActionBar height -->
    <dimen name="actionbar_size">56dip</dimen>
+14 −14
Original line number Diff line number Diff line
@@ -5599,20 +5599,20 @@
    <string name="accessibility_color_inversion_about_title">About color inversion</string>
    <!-- Color correction footer link content description [CHAR LIMIT=NONE] -->
    <string name="accessibility_color_inversion_footer_learn_more_content_description">Learn more about color inversion</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_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] -->
    <string name="captioning_caption_appearance_summary"><xliff:g id="accessibility_font_size" example="Large">%1$s</xliff:g> text size</string>
    <!-- Title for Caption preference settings screen for configuring language. [CHAR LIMIT=NONE] -->
    <!-- Title for captioning settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
    <string name="accessibility_captioning_primary_switch_title">Show captions</string>
    <!-- Summary for captioning settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->
    <string name="accessibility_captioning_primary_switch_summary">For supported app only</string>
    <!-- Title for captioning preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->
    <string name="captioning_appearance_title">Caption size and style</string>
    <!-- Summary for captioning settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
    <string name="captioning_appearance_summary"><xliff:g id="accessibility_font_size" example="Large">%1$s</xliff:g> text size</string>
    <!-- Title for captioning preference settings screen for configuring language. [CHAR LIMIT=NONE] -->
    <string name="captioning_more_options_title">More options</string>
    <!-- Introduction for the captions preference page. [CHAR LIMIT=NONE] -->
    <string name="accessibility_caption_preference_intro">Customize caption size and style to make them easier to read</string>
    <!-- Summary for the captions preference page. [CHAR LIMIT=NONE] -->
    <string name="accessibility_caption_preference_summary">These caption preferences aren\u2019t supported by all media apps</string>
    <!-- Introduction for the captioning preference page. [CHAR LIMIT=NONE] -->
    <string name="accessibility_captioning_preference_intro">Customize caption size and style to make them easier to read</string>
    <!-- Summary for the captioning preference page. [CHAR LIMIT=NONE] -->
    <string name="accessibility_captioning_preference_summary">These caption preferences aren\u2019t supported by all media apps</string>
    <!-- Summary for accessibility shortcut preference for software shortcut type. [CHAR LIMIT=NONE] -->
    <string name="accessibility_shortcut_type_software">Accessibility button</string>
    <!-- Summary for accessibility shortcut preference for software shortcut type when gesture mode is on. [CHAR LIMIT=NONE] -->
@@ -5793,7 +5793,7 @@
    <string name="captioning_edge_type">Edge type</string>
    <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
    <string name="captioning_typeface">Font family</string>
    <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
    <!-- Sample text for previewing video captioning preferences. [CHAR LIMIT=NONE] -->
    <string name="captioning_preview_text">Captions will look like this</string>
    <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
    <string name="captioning_preview_characters">Aa</string>
+1 −2
Original line number Diff line number Diff line
@@ -119,10 +119,9 @@
            settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>

        <Preference
            android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
            android:fragment="com.android.settings.accessibility.CaptioningPropertiesFragment"
            android:key="captioning_preference_screen"
            android:icon="@drawable/ic_captioning"
            android:persistent="false"
            android:title="@string/accessibility_captioning_title"
            settings:controller="com.android.settings.accessibility.CaptioningPreferenceController"/>

Loading