Bug 712760 - Add some smaller font inflation size options [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 17 Jan 2012 12:39:45 -0800
changeset 84750 b8ede0b17a1c05aa58298d409c5f6a2bf986ae08
parent 84749 546e69d2fe66a6f69e1e3e6fb388a447b49d1ff4
child 84751 6da5a83a4a5c18dbaedf9bb2518020dc0e60c9b7
push id21873
push usermlamouri@mozilla.com
push dateWed, 18 Jan 2012 10:29:07 +0000
treeherdermozilla-central@7538f4d4697c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs712760
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 712760 - Add some smaller font inflation size options [r=mfinkle]
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/values/arrays.xml
mobile/android/base/resources/xml/preferences.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -55,17 +55,18 @@
 <!ENTITY pref_clear_history "Clear history">
 <!ENTITY pref_clear_history_confirm "Browsing history will be deleted">
 <!ENTITY pref_clear_private_data "Clear private data">
 <!ENTITY pref_clear_private_data_confirm "Browsing settings, including passwords and cookies, will be deleted">
 <!ENTITY pref_plugins "Plugins">
 <!ENTITY pref_plugins_enabled "Enabled">
 <!ENTITY pref_plugins_tap_to_play "Tap to play">
 <!ENTITY pref_plugins_disabled "Disabled">
-<!ENTITY pref_font_size "Font size">
+<!ENTITY pref_text_size "Text size">
+<!ENTITY pref_font_size_tiny "Tiny">
 <!ENTITY pref_font_size_small "Small">
 <!ENTITY pref_font_size_medium "Medium">
 <!ENTITY pref_font_size_large "Large">
 <!ENTITY pref_font_size_xlarge "Extra Large">
 <!ENTITY pref_use_master_password "Use master password">
 
 <!ENTITY quit "Quit">
 
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -7,20 +7,22 @@
         <item>@string/pref_plugins_disabled</item>
     </string-array>
     <string-array name="pref_plugins_values">
         <item>1</item>
         <item>2</item>
         <item>0</item>
     </string-array>
     <string-array name="pref_font_size_entries">
+        <item>@string/pref_font_size_tiny</item>
         <item>@string/pref_font_size_small</item>
         <item>@string/pref_font_size_medium</item>
         <item>@string/pref_font_size_large</item>
         <item>@string/pref_font_size_xlarge</item>
     </string-array>
     <string-array name="pref_font_size_values">
+        <item>0</item>
+        <item>80</item>
         <item>120</item>
         <item>160</item>
-        <item>200</item>
-        <item>280</item>
+        <item>240</item>
     </string-array>
 </resources>
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -21,17 +21,17 @@
 
         <ListPreference     android:key="plugin.enable"
                             android:title="@string/pref_plugins"
                             android:entries="@array/pref_plugins_entries"
                             android:entryValues="@array/pref_plugins_values"
                             android:persistent="false" />
 
         <ListPreference     android:key="font.size.inflation.minTwips"
-                            android:title="@string/pref_font_size"
+                            android:title="@string/pref_text_size"
                             android:entries="@array/pref_font_size_entries"
                             android:entryValues="@array/pref_font_size_values"
                             android:persistent="false" />
 
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_privacy">
 
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -61,17 +61,18 @@
   <string name="pref_clear_history">&pref_clear_history;</string>
   <string name="pref_clear_history_confirm">&pref_clear_history_confirm;</string>
   <string name="pref_clear_private_data">&pref_clear_private_data;</string>
   <string name="pref_clear_private_data_confirm">&pref_clear_private_data_confirm;</string>
   <string name="pref_plugins">&pref_plugins;</string>
   <string name="pref_plugins_enabled">&pref_plugins_enabled;</string>
   <string name="pref_plugins_tap_to_play">&pref_plugins_tap_to_play;</string>
   <string name="pref_plugins_disabled">&pref_plugins_disabled;</string>
-  <string name="pref_font_size">&pref_font_size;</string>
+  <string name="pref_text_size">&pref_text_size;</string>
+  <string name="pref_font_size_tiny">&pref_font_size_tiny;</string>
   <string name="pref_font_size_small">&pref_font_size_small;</string>
   <string name="pref_font_size_medium">&pref_font_size_medium;</string>
   <string name="pref_font_size_large">&pref_font_size_large;</string>
   <string name="pref_font_size_xlarge">&pref_font_size_xlarge;</string>
 
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>
   <string name="new_tab">&new_tab;</string>