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
This commit is contained in:
ChenJean
96
res/xml/captioning_appearance.xml
Normal file
96
res/xml/captioning_appearance.xml
Normal file
@@ -0,0 +1,96 @@
|
||||
<?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>
|
||||
34
res/xml/captioning_more_options.xml
Normal file
34
res/xml/captioning_more_options.xml
Normal file
@@ -0,0 +1,34 @@
|
||||
<?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>
|
||||
@@ -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"/>
|
||||
<SwitchPreference
|
||||
android:key="captioning_preference_switch"
|
||||
android:title="@string/accessibility_caption_master_switch_title" />
|
||||
|
||||
<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" />
|
||||
<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" />
|
||||
|
||||
<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" />
|
||||
|
||||
<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"
|
||||
|
||||
Reference in New Issue
Block a user