diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-03-04 17:33:19 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-04 17:33:19 -0800 |
commit | 6bb14c7be78e56f79e6f1d8345706397eeb4623b (patch) | |
tree | 020cc7a064aed200525062ca666b0afa69076292 /res | |
parent | 975ba224b74b8a0b589faf33553de1c55f0623de (diff) | |
parent | 6677e56f45c8e7b922efc4cc28d11529097b8ea6 (diff) | |
download | packages_apps_settings-6bb14c7be78e56f79e6f1d8345706397eeb4623b.zip packages_apps_settings-6bb14c7be78e56f79e6f1d8345706397eeb4623b.tar.gz packages_apps_settings-6bb14c7be78e56f79e6f1d8345706397eeb4623b.tar.bz2 |
Merge "Add font size preference."
Diffstat (limited to 'res')
-rw-r--r-- | res/values/arrays.xml | 20 | ||||
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/xml/display_settings.xml | 9 |
3 files changed, 35 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 6194719..4233f6d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -137,6 +137,26 @@ <item>1800000</item> </string-array> + <string-array name="entries_font_size"> + <item>Extremely Small</item> + <item>Extra Small</item> + <item>Small</item> + <item>Normal</item> + <item>Large</item> + <item>Extra Large</item> + <item>Extremely Large</item> + </string-array> + + <string-array name="entryvalues_font_size"> + <item>0.70</item> + <item>0.85</item> + <item>0.95</item> + <item>1.0</item> + <item>1.05</item> + <item>1.15</item> + <item>1.30</item> + </string-array> + <!-- TTS settings --> <!-- Default speech rate choices --> diff --git a/res/values/strings.xml b/res/values/strings.xml index a261e9f..b508280 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1442,6 +1442,12 @@ <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string> <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions --> <string name="automatic_brightness">Automatic brightness</string> + <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size --> + <string name="title_font_size">Font size</string> + <!-- [CHAR LIMIT=40] Sound & display settings screen, setting option summary to change font size --> + <string name="summary_font_size">Overall size of fonts</string> + <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size --> + <string name="dialog_title_font_size">Select font size</string> <!-- SIM lock settings title --> <string name="sim_lock_settings">SIM card lock settings</string> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 7fe7f76..5e2d76e 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -41,4 +41,13 @@ android:persistent="false" android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> + + <ListPreference + android:key="font_size" + android:title="@string/title_font_size" + android:summary="@string/summary_font_size" + android:entries="@array/entries_font_size" + android:entryValues="@array/entryvalues_font_size" + android:dialogTitle="@string/dialog_title_font_size" /> + </PreferenceScreen> |