Accessibility tweaks
Min font size now shows pt value
Text size replaced with text zoom
Change-Id: Ic5906be094425bc5099a17571868c7a994a6cb86
diff --git a/res/layout/font_size_widget.xml b/res/layout/font_size_widget.xml
new file mode 100644
index 0000000..296f5bf
--- /dev/null
+++ b/res/layout/font_size_widget.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minWidth="50sp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_gravity="center_vertical"
+/>
+
diff --git a/res/layout/min_font_size.xml b/res/layout/min_font_size.xml
deleted file mode 100644
index d4d1314..0000000
--- a/res/layout/min_font_size.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingRight="6dip"
- android:paddingTop="6dip"
- android:paddingBottom="6dip"
- android:paddingLeft="8dip">
-
- <TextView
- android:text="@string/pref_min_font_size"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <SeekBar
- android:id="@+id/seekbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
-</LinearLayout>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2515d9..c846965 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -510,9 +510,7 @@
<string name="pref_security_accept_cookies">Accept cookies</string>
<!-- Settings summary -->
<string name="pref_security_accept_cookies_summary">Allow sites to save and read \"cookie\" data</string>
- <!-- Settings label -->
- <string name="pref_text_size">Text size</string>
- <!-- Settings text size options; appear in Text size dialog box -->
+ <!-- Settings text size options; appear in Text size dialog box [CHAR LIMIT=30] -->
<string-array name="pref_text_size_choices">
<item>Tiny</item>
<item>Small</item>
@@ -520,18 +518,12 @@
<item>Large</item>
<item>Huge</item>
</string-array>
- <!-- Title of dialog for setting the text size -->
- <string name="pref_text_size_dialogtitle">Text size</string>
- <!-- Do not translate -->
- <string-array name="pref_text_size_values" translatable="false">
- <item><xliff:g>SMALLEST</xliff:g></item>
- <item><xliff:g>SMALLER</xliff:g></item>
- <item><xliff:g>NORMAL</xliff:g></item>
- <item><xliff:g>LARGER</xliff:g></item>
- <item><xliff:g>LARGEST</xliff:g></item>
- </string-array>
<!-- Label for minimum font size [CHAR LIMIT=30] -->
<string name="pref_min_font_size">Minimum font size</string>
+ <!-- Label for the current minimum font size value [CHAR LIMIT=6] -->
+ <string name="pref_min_font_size_value"><xliff:g id="font_size">%d</xliff:g>pt</string>
+ <!-- Label for text zoom (percent) [CHAR LIMIT=30] -->
+ <string name="pref_text_zoom">Text zoom</string>
<!-- Label for whether or not to force-enable user scalablity (aka, zoom) [CHAR LIMIT=30] -->
<string name="pref_force_userscalable">Force enable zoom</string>
<!-- Summary for whether or not to force-enable user scalablity (aka, zoom) [CHAR LIMIT=30] -->
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index 6109a64..a7124f4 100644
--- a/res/xml/accessibility_preferences.xml
+++ b/res/xml/accessibility_preferences.xml
@@ -26,19 +26,17 @@
<com.android.browser.preferences.WebViewPreview
android:title="@string/preview" />
- <ListPreference
- android:key="text_size"
- android:title="@string/pref_text_size"
- android:defaultValue="NORMAL"
- android:entries="@array/pref_text_size_choices"
- android:entryValues="@array/pref_text_size_values"
- android:dialogTitle="@string/pref_text_size_dialogtitle" />
+ <com.android.browser.preferences.FontSizePreference
+ android:key="text_zoom"
+ android:title="@string/pref_text_zoom"
+ android:defaultValue="10"
+ android:max="30" />
<com.android.browser.preferences.FontSizePreference
android:key="min_font_size"
android:title="@string/pref_min_font_size"
android:defaultValue="0"
- android:max="18" />
+ android:max="20" />
</PreferenceCategory>