From 41d245fdac9d3c94aaaf769cde43555c4e56cc04 Mon Sep 17 00:00:00 2001 From: dominique vincent Date: Tue, 10 Nov 2015 21:07:21 +0100 Subject: [PATCH] Bug 1196146 - Activation of the zoomed view in Aurora. r=mcomella --- mobile/android/base/BrowserApp.java | 8 ++------ mobile/android/base/preferences/GeckoPreferences.java | 7 ------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index 000d60dcea05..e127d2bd4694 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -173,8 +173,6 @@ public class BrowserApp extends GeckoApp LayoutInflater.Factory { private static final String LOGTAG = "GeckoBrowserApp"; - private static final boolean ZOOMED_VIEW_ENABLED = AppConstants.NIGHTLY_BUILD; - private static final int TABS_ANIMATION_DURATION = 450; private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast"; @@ -746,10 +744,8 @@ public class BrowserApp extends GeckoApp // Set the maximum bits-per-pixel the favicon system cares about. IconDirectoryEntry.setMaxBPP(GeckoAppShell.getScreenDepth()); - if (ZOOMED_VIEW_ENABLED) { - ViewStub stub = (ViewStub) findViewById(R.id.zoomed_view_stub); - mZoomedView = (ZoomedView) stub.inflate(); - } + ViewStub stub = (ViewStub) findViewById(R.id.zoomed_view_stub); + mZoomedView = (ZoomedView) stub.inflate(); } /** diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index fe69a9670ebd..a60e0a547c8f 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -699,13 +699,6 @@ OnSharedPreferenceChangeListener i--; continue; } - } else if (PREFS_ZOOMED_VIEW_ENABLED.equals(key)) { - // Only enable the ZoomedView / magnifying pref on Nightly. - if (!AppConstants.NIGHTLY_BUILD) { - preferences.removePreference(pref); - i--; - continue; - } } else if (PREFS_OPEN_URLS_IN_PRIVATE.equals(key)) { // Remove UI for opening external links in private browsing on non-Nightly builds. if (!AppConstants.NIGHTLY_BUILD || !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_PRIVATE_BROWSING)) {