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

Commit f55c5a44 authored by ChenJean's avatar ChenJean
Browse files

Support caption second UI structure (2/n) 

Group text size and style into appearance page.
Move language under more options page.

Bug: 143502915
Test: Maunal
Change-Id: Ice104ed844dc3a10a22c91a10211a8978da68cc3
parent 7b77b497

res/values/strings.xml

+7 −1
Original line number Diff line number Diff line
@@ -4922,7 +4922,13 @@ 
    <!-- 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>

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

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

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

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

    <string name="captioning_caption_appearance_title">Caption appearance</string>

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

    <string name="captioning_caption_appearance_summary">Text size, caption style</string>

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

    <string name="captioning_more_options_title">More options</string>

    <!-- Used in the Captions preference to tell users that the setting doesn't support all apps. [CHAR LIMIT=NONE] -->

    <string name="accessibility_caption_preference_summary">Not all apps support this setting.</string>

    <!-- Summary for accessibility shortcut preference for software shortcut type. [CHAR LIMIT=NONE] -->

res/xml/captioning_appearance.xml

0 → 100644
+96 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen

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

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

    android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment"

    android:key="captioning_appearance_screen"

    android:title="@string/captioning_caption_appearance_title">



    <com.android.settingslib.widget.LayoutPreference

        android:key="caption_preview"

        android:title="@string/summary_placeholder"

        android:layout="@layout/captioning_preview"

        android:selectable="false"

        settings:searchable="false"/>



    <ListPreference

        android:entries="@array/captioning_font_size_selector_titles"

        android:entryValues="@array/captioning_font_size_selector_values"

        android:key="captioning_font_size"

        android:summary="%s"

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



    <com.android.settings.accessibility.PresetPreference

        android:key="captioning_preset"

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



    <PreferenceCategory

        android:key="custom"

        android:title="@string/captioning_custom_options_title">



        <ListPreference

            android:entries="@array/captioning_typeface_selector_titles"

            android:entryValues="@array/captioning_typeface_selector_values"

            android:key="captioning_typeface"

            android:summary="%s"

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



        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_foreground_color"

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



        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_foreground_color"

            android:key="captioning_foreground_opacity"

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



        <com.android.settings.accessibility.EdgeTypePreference

            android:key="captioning_edge_type"

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



        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_edge_type"

            android:key="captioning_edge_color"

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



        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_background_color"

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



        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_background_color"

            android:key="captioning_background_opacity"

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



        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_window_color"

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



        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_window_color"

            android:key="captioning_window_opacity"

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



    </PreferenceCategory>



    <com.android.settingslib.widget.FooterPreference

        android:title="@string/accessibility_caption_preference_summary"

        android:selectable="false"/>



</PreferenceScreen>

res/xml/captioning_more_options.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen

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

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

    android:fragment="com.android.settings.accessibility.CaptionMoreOptionsFragment"

    android:key="captioning_more_options_screen"

    android:title="@string/captioning_more_options_title" >



    <com.android.settings.accessibility.LocalePreference

        android:key="captioning_locale"

        android:summary="%s"

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



    <com.android.settingslib.widget.FooterPreference

        android:title="@string/accessibility_caption_preference_summary"

        android:selectable="false" />



</PreferenceScreen>

res/xml/captioning_settings.xml

+14 −70
Original line number Diff line number Diff line
@@ -15,83 +15,27 @@ 
     limitations under the License.

-->



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

<PreferenceScreen

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

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

    android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"

    android:key="captioning_preference_screen"

    android:title="@string/accessibility_captioning_title" >



    <com.android.settingslib.widget.LayoutPreference

        android:key="caption_preview"

        android:title="@string/summary_placeholder"

        android:layout="@layout/captioning_preview"

        android:selectable="false"

        settings:searchable="false"/>



    <PreferenceCategory

        android:key="standard"

        android:title="@string/captioning_standard_options_title" >

    <SwitchPreference

        android:key="captioning_preference_switch"

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



        <ListPreference

            android:entries="@array/captioning_font_size_selector_titles"

            android:entryValues="@array/captioning_font_size_selector_values"

            android:key="captioning_font_size"

            android:summary="%s"

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



        <com.android.settings.accessibility.PresetPreference

            android:key="captioning_preset"

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



        <com.android.settings.accessibility.LocalePreference

            android:key="captioning_locale"

            android:summary="%s"

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

    </PreferenceCategory>

    <PreferenceCategory

        android:key="custom"

        android:title="@string/captioning_custom_options_title" >

        <ListPreference

            android:entries="@array/captioning_typeface_selector_titles"

            android:entryValues="@array/captioning_typeface_selector_values"

            android:key="captioning_typeface"

            android:summary="%s"

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



        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_foreground_color"

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

        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_foreground_color"

            android:key="captioning_foreground_opacity"

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



        <com.android.settings.accessibility.EdgeTypePreference

            android:key="captioning_edge_type"

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

    <Preference

        android:key="captioning_caption_appearance"

        android:title="@string/captioning_caption_appearance_title"

        android:summary="@string/captioning_caption_appearance_summary"

        android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment" />



        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_edge_type"

            android:key="captioning_edge_color"

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

        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_background_color"

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

        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_background_color"

            android:key="captioning_background_opacity"

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

        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_window_color"

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

        <com.android.settings.accessibility.ColorPreference

            android:dependency="captioning_window_color"

            android:key="captioning_window_opacity"

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

    </PreferenceCategory>

    <Preference

        android:key="captioning_more_options"

        android:title="@string/captioning_more_options_title"

        android:fragment="com.android.settings.accessibility.CaptionMoreOptionsFragment" />



    <com.android.settingslib.widget.FooterPreference

        android:title="@string/accessibility_caption_preference_summary"