diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 7fd892fec48c..df5544380346 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -217,6 +217,9 @@ + + + diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index a71f9575305c..1ae1b3dca4a0 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/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); diff --git a/mobile/android/base/resources/xml-v11/preferences_customize.xml b/mobile/android/base/resources/xml-v11/preferences_customize.xml index 8cbaad39714e..9ff2ee0f9323 100644 --- a/mobile/android/base/resources/xml-v11/preferences_customize.xml +++ b/mobile/android/base/resources/xml-v11/preferences_customize.xml @@ -31,6 +31,11 @@ android:entryValues="@array/pref_restore_values" android:persistent="true" /> + + + + + + &pref_cookies_not_accept_foreign; &pref_cookies_disabled; + &pref_tap_to_load_images_title; + &pref_tap_to_load_images_summary; + &pref_tracking_protection_title; &pref_tracking_protection_summary3; &pref_donottrack_title;