Bug 803630: Remove the android settings UI for reflow-on-zoom feature. [r=mfinkle][a=bajaj]
authorScott Johnson <sjohnson@mozilla.com>
Thu, 25 Oct 2012 14:59:50 -0500
changeset 113654 ddd4b27cd64f809ad2086bb12533f3510d5f7049
parent 113653 b6f00660c9744cbc7889d50fdf9f9655fc441a0a
child 113655 b4db9e158fafcef5fdb461f9c5faadfa87920735
push id2449
push usersjohnson@mozilla.com
push dateThu, 25 Oct 2012 20:03:00 +0000
treeherdermozilla-aurora@ddd4b27cd64f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, bajaj
bugs803630
milestone18.0a2
Bug 803630: Remove the android settings UI for reflow-on-zoom feature. [r=mfinkle][a=bajaj]
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences.xml.in
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
@@ -76,17 +76,16 @@
 <!ENTITY pref_char_encoding_on "Show menu">
 <!ENTITY pref_char_encoding_off "Don\'t show menu">
 <!ENTITY pref_clear_private_data "Clear private data">
 <!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_text_size "Text size">
-<!ENTITY pref_reflow_on_zoom "Enable Reflow-On-Zoom">
 <!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_font_size_set "Set">
 <!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
 (or combination of characters) is used to decrease the preview font size; a larger version of the
--- a/mobile/android/base/resources/xml/preferences.xml.in
+++ b/mobile/android/base/resources/xml/preferences.xml.in
@@ -34,22 +34,16 @@
 
         <org.mozilla.gecko.FontSizePreference
                         android:key="font.size.inflation.minTwips"
                         android:title="@string/pref_text_size"
                         android:positiveButtonText="@string/pref_font_size_set"
                         android:negativeButtonText="@string/button_cancel"
                         android:persistent="false" />
 
-        <CheckBoxPreference
-                        android:key="browser.zoom.reflowOnZoom"
-                        android:title="@string/pref_reflow_on_zoom"
-                        android:defaultValue="false"
-                        android:persistent="false" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_privacy">
 
         <!-- keys prefixed with "android.not_a_preference." are not synced with Gecko -->
         <org.mozilla.gecko.PrivateDataPreference
                             android:key="android.not_a_preference.privacy.clear"
                             android:title="@string/pref_clear_private_data"
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -90,17 +90,16 @@
   <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="pref_font_size_set">&pref_font_size_set;</string>
   <string name="pref_font_size_adjust_char">&pref_font_size_adjust_char;</string>
   <string name="pref_font_size_preview_text">&pref_font_size_preview_text;</string>
-  <string name="pref_reflow_on_zoom">&pref_reflow_on_zoom;</string>
   <string name="pref_show_product_announcements">&pref_show_product_announcements;</string>
   <string name="pref_sync">&pref_sync;</string>
   <string name="pref_search_suggestions">&pref_search_suggestions;</string>
   <string name="pref_private_data_history">&pref_private_data_history;</string>
   <string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
   <string name="pref_private_data_cookies2">&pref_private_data_cookies2;</string>
   <string name="pref_private_data_passwords">&pref_private_data_passwords;</string>
   <string name="pref_private_data_cache">&pref_private_data_cache;</string>