PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UI change in caption preferences in Settings" into qt-r1-dev

Browse Source 
am: af447c17b8

Change-Id: Iba6562299043b23d2f3b5cbb06ed4ae23dede871
This commit is contained in:
Kevin Chang
2019-07-18 00:42:38 -07:00
committed by android-build-merger
parent 05648f64de af447c17b8
commit 2a725532f5
2 changed files with 45 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/captioning_settings.xml
View File

@@ -30,10 +30,9 @@
<PreferenceCategory
android:key="standard"
android:title="@string/captioning_standard_options_title" >
<com.android.settings.accessibility.LocalePreference
android:key="captioning_locale"
android:summary="%s"
android:title="@string/captioning_locale" />
<SwitchPreference
android:key="captioning_preference_switch"
android:title="@string/accessibility_caption_master_switch_title" />
<ListPreference
android:entries="@array/captioning_font_size_selector_titles"
@@ -45,6 +44,11 @@
<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"