Bug 1195063 - Create a UI Settings option for changing the image threshold image size for click-to-play images r=mfinkle

--HG--
extra : transplant_source : e%5D%C7%BDC9%5DU%8B%0B%0As%DD%1B%00%8D%B9%2CG%F5

mobile/android/base/locales/en-US/android_strings.dtd

@@ -217,6 +217,9 @@
 <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party">
 <!ENTITY pref_cookies_disabled "Disabled">
 
+<!ENTITY pref_tap_to_load_images_title "Tap-to-load images">
+<!ENTITY pref_tap_to_load_images_summary "Load images only when you tap on them">
+
 <!ENTITY pref_tracking_protection_title "Tracking protection">
 <!ENTITY pref_tracking_protection_summary3 "Enabled in Private Browsing">
 <!ENTITY pref_donottrack_title "Do not track">

mobile/android/base/preferences/GeckoPreferences.java

@@ -133,6 +133,7 @@ OnSharedPreferenceChangeListener
     private static final String PREFS_DEVTOOLS = NON_PREF_PREFIX + "devtools.enabled";
     private static final String PREFS_DISPLAY = NON_PREF_PREFIX + "display.enabled";
     private static final String PREFS_CUSTOMIZE_HOME = NON_PREF_PREFIX + "customize_home";
+    private static final String PREFS_CUSTOMIZE_IMAGE_BLOCKING = "browser.image_blocking.enabled";
     private static final String PREFS_TRACKING_PROTECTION_PRIVATE_BROWSING = "privacy.trackingprotection.pbmode.enabled";
     private static final String PREFS_TRACKING_PROTECTION_LEARN_MORE = NON_PREF_PREFIX + "trackingprotection.learn_more";
     private static final String PREFS_CATEGORY_PRIVATE_DATA = NON_PREF_PREFIX + "category_private_data";
@@ -886,6 +887,13 @@ OnSharedPreferenceChangeListener
                         i--;
                         continue;
                     }
+                } else if (PREFS_CUSTOMIZE_IMAGE_BLOCKING.equals(key)) {
+                    // Only enable the ZoomedView / magnifying pref on Nightly.
+                    if (!AppConstants.NIGHTLY_BUILD) {
+                        preferences.removePreference(pref);
+                        i--;
+                        continue;
+                    }
                 } else if (PREFS_HOMEPAGE.equals(key)) {
                     String setUrl = GeckoSharedPrefs.forProfile(getBaseContext()).getString(PREFS_HOMEPAGE, AboutPages.HOME);
                     setHomePageSummary(pref, setUrl);

mobile/android/base/resources/xml-v11/preferences_customize.xml

@@ -31,6 +31,11 @@
                     android:entryValues="@array/pref_restore_values"
                     android:persistent="true" />
 
+    <CheckBoxPreference android:key="browser.image_blocking.enabled"
+                        android:title="@string/pref_tap_to_load_images_title"
+                        android:summary="@string/pref_tap_to_load_images_summary"
+                        android:defaultValue="false"/>
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"

mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

@@ -38,6 +38,11 @@
                     android:entryValues="@array/pref_restore_values"
                     android:persistent="true" />
 
+    <CheckBoxPreference android:key="browser.image_blocking.enabled"
+                        android:title="@string/pref_tap_to_load_images_title"
+                        android:summary="@string/pref_tap_to_load_images_summary"
+                        android:defaultValue="false"/>
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"

mobile/android/base/resources/xml/preferences_customize.xml

@@ -39,6 +39,11 @@
                     android:entryValues="@array/pref_restore_values"
                     android:persistent="true" />
 
+    <CheckBoxPreference android:key="browser.image_blocking.enabled"
+                        android:title="@string/pref_tap_to_load_images_title"
+                        android:summary="@string/pref_tap_to_load_images_summary"
+                        android:defaultValue="false"/>
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"

mobile/android/base/strings.xml.in

@@ -208,6 +208,9 @@
   <string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string>
   <string name="pref_cookies_disabled">&pref_cookies_disabled;</string>
 
+  <string name="pref_tap_to_load_images_title">&pref_tap_to_load_images_title;</string>
+  <string name="pref_tap_to_load_images_summary">&pref_tap_to_load_images_summary;</string>
+
   <string name="pref_tracking_protection_title">&pref_tracking_protection_title;</string>
   <string name="pref_tracking_protection_summary">&pref_tracking_protection_summary3;</string>
   <string name="pref_donottrack_title">&pref_donottrack_title;</string>