diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-11 02:15:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 02:15:28 +0000 |
| commit | 0100a310d8184baf9576925d160f8af09aa93b10 (patch) | |
| tree | 183a9f63270a2b03ba9344d6034b1eafebe765de /res | |
| parent | a74da813ec622822c8bb8b4524439c81e8b90dfa (diff) | |
| parent | 8840aa4c406bf08bba186cf9e674033bd1b9a4c1 (diff) | |
| download | packages_apps_Settings-0100a310d8184baf9576925d160f8af09aa93b10.zip packages_apps_Settings-0100a310d8184baf9576925d160f8af09aa93b10.tar.gz packages_apps_Settings-0100a310d8184baf9576925d160f8af09aa93b10.tar.bz2 | |
am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/captioning_settings.xml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c600bb..8a98aba 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3330,6 +3330,8 @@ <string name="captioning_background_opacity">Background opacity</string> <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] --> <string name="captioning_foreground_color">Text color</string> + <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] --> + <string name="captioning_foreground_opacity">Text opacity</string> <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] --> <string name="captioning_edge_color">Edge color</string> <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] --> diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml index 02fe51f..d14d352 100644 --- a/res/xml/captioning_settings.xml +++ b/res/xml/captioning_settings.xml @@ -58,6 +58,10 @@ android:key="captioning_foreground_color" android:persistent="false" android:title="@string/captioning_foreground_color" /> + <com.android.settings.accessibility.ColorPreference + android:key="captioning_foreground_opacity" + android:persistent="false" + android:title="@string/captioning_foreground_opacity" /> <com.android.settings.accessibility.EdgeTypePreference android:key="captioning_edge_type" |