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

am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev

Browse Source 
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
  Update captioning settings to match final design
This commit is contained in:
Alan Viverette
2013-08-09 15:54:15 -07:00
committed by Android Git Automerger
parent d0a3f8727f 85c37e78b5
commit 2a19a31c94
6 changed files with 118 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout/grid_picker_dialog.xml
View File

@@ -15,19 +15,12 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<GridView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="400dp"
android:columnWidth="112dp"
android:numColumns="auto_fit"
android:stretchMode="spacingWidthUniform"
android:verticalSpacing="16dp"
android:paddingTop="16dp" />
</LinearLayout>
android:layout_height="300dp"
android:columnWidth="112dp"
android:numColumns="auto_fit"
android:paddingTop="16dp"
android:stretchMode="spacingWidthUniform"
android:verticalSpacing="16dp" />

86
res/values/arrays.xml
View File

@@ -759,7 +759,6 @@
<!-- Titles for captioning color preference. -->
<string-array name="captioning_color_selector_titles" translatable="false" >
<item>@string/color_white</item>
<item>@string/color_gray</item>
<item>@string/color_black</item>
<item>@string/color_red</item>
<item>@string/color_yellow</item>
@@ -772,35 +771,6 @@
<!-- Values for captioning color preference. -->
<integer-array name="captioning_color_selector_values" translatable="false" >
<item>0xFFFFFFFF</item>
<item>0xFF808080</item>
<item>0xFF000000</item>
<item>0xFFFF0000</item>
<item>0xFFFFFF00</item>
<item>0xFF00FF00</item>
<item>0xFF00FFFF</item>
<item>0xFF0000FF</item>
<item>0xFFFF00FF</item>
</integer-array>
<!-- Titles for captioning background color preference. -->
<string-array name="captioning_background_color_selector_titles" translatable="false" >
<item>@string/color_none</item>
<item>@string/color_white</item>
<item>@string/color_gray</item>
<item>@string/color_black</item>
<item>@string/color_red</item>
<item>@string/color_yellow</item>
<item>@string/color_green</item>
<item>@string/color_cyan</item>
<item>@string/color_blue</item>
<item>@string/color_magenta</item>
</string-array>
<!-- Values for captioning background color preference. -->
<integer-array name="captioning_background_color_selector_values" translatable="false" >
<item>0x00000000</item>
<item>0xFFFFFFFF</item>
<item>0xFF808080</item>
<item>0xFF000000</item>
<item>0xFFFF0000</item>
<item>0xFFFFFF00</item>
@@ -808,6 +778,62 @@
<item>0xFF00FFFF</item>
<item>0xFF0000FF</item>
<item>0xFFFF00FF</item>
<item>0xFF000055</item>
<item>0xFF0000AA</item>
<item>0xFF005500</item>
<item>0xFF005555</item>
<item>0xFF0055AA</item>
<item>0xFF0055FF</item>
<item>0xFF00AA00</item>
<item>0xFF00AA55</item>
<item>0xFF00AAAA</item>
<item>0xFF00AAFF</item>
<item>0xFF00FF55</item>
<item>0xFF00FFAA</item>
<item>0xFF550000</item>
<item>0xFF550055</item>
<item>0xFF5500AA</item>
<item>0xFF5500FF</item>
<item>0xFF555500</item>
<item>0xFF555555</item>
<item>0xFF5555AA</item>
<item>0xFF5555FF</item>
<item>0xFF55AA00</item>
<item>0xFF55AA55</item>
<item>0xFF55AAAA</item>
<item>0xFF55AAFF</item>
<item>0xFF55FF00</item>
<item>0xFF55FF55</item>
<item>0xFF55FFAA</item>
<item>0xFF55FFFF</item>
<item>0xFFAA0000</item>
<item>0xFFAA0055</item>
<item>0xFFAA00AA</item>
<item>0xFFAA00FF</item>
<item>0xFFAA5500</item>
<item>0xFFAA5555</item>
<item>0xFFAA55AA</item>
<item>0xFFAA55FF</item>
<item>0xFFAAAA00</item>
<item>0xFFAAAA55</item>
<item>0xFFAAAAAA</item>
<item>0xFFAAAAFF</item>
<item>0xFFAAFF00</item>
<item>0xFFAAFF55</item>
<item>0xFFAAFFAA</item>
<item>0xFFAAFFFF</item>
<item>0xFFFF0055</item>
<item>0xFFFF00AA</item>
<item>0xFFFF5500</item>
<item>0xFFFF5555</item>
<item>0xFFFF55AA</item>
<item>0xFFFF55FF</item>
<item>0xFFFFAA00</item>
<item>0xFFFFAA55</item>
<item>0xFFFFAAAA</item>
<item>0xFFFFAAFF</item>
<item>0xFFFFFF55</item>
<item>0xFFFFFFAA</item>
</integer-array>
<!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->

2
res/values/strings.xml
View File

@@ -3303,6 +3303,8 @@
<string name="color_yellow">Yellow</string>
<!-- Label for the color magenta. [CHAR LIMIT=35] -->
<string name="color_magenta">Magenta</string>
<!-- Label for custom colors, formats as a HTML color. -->
<string name="color_custom" translatable="false">#%1$02X%2$02X%3$02X</string>
<!-- Title for a warning about security implications of enabling an accessibility
service. [CHAR LIMIT=NONE] -->

4
res/xml/captioning_settings.xml
View File

@@ -47,7 +47,6 @@
android:key="custom"
android:title="@string/captioning_custom_options_title" >
<ListPreference
android:dependency="captioning_preset"
android:entries="@array/captioning_typeface_selector_titles"
android:entryValues="@array/captioning_typeface_selector_values"
android:key="captioning_typeface"
@@ -56,13 +55,11 @@
android:title="@string/captioning_typeface" />
<com.android.settings.accessibility.ColorPreference
android:dependency="captioning_preset"
android:key="captioning_foreground_color"
android:persistent="false"
android:title="@string/captioning_foreground_color" />
<com.android.settings.accessibility.EdgeTypePreference
android:dependency="captioning_preset"
android:key="captioning_edge_type"
android:persistent="false"
android:title="@string/captioning_edge_type" />
@@ -73,7 +70,6 @@
android:persistent="false"
android:title="@string/captioning_edge_color" />
<com.android.settings.accessibility.ColorPreference
android:dependency="captioning_preset"
android:key="captioning_background_color"
android:persistent="false"
android:title="@string/captioning_background_color" />