Bug 1196146 - Activation of the zoomed view in Aurora. r=mcomella
authordominique vincent <domivinc@toitl.com>
Tue, 10 Nov 2015 21:07:21 +0100
changeset 308698 6cbadfaa418a058b493dbdb3dcac2f99dbf0ed5d
parent 308697 abd472b690d7932b2a1b36167bdca62387604efe
child 308699 09bbdb107c10aff33668d6dbfefed29e1dd707e0
push id7514
push users.kaspari@gmail.com
push dateFri, 13 Nov 2015 14:12:41 +0000
reviewersmcomella
bugs1196146
milestone45.0a1
Bug 1196146 - Activation of the zoomed view in Aurora. r=mcomella
mobile/android/base/BrowserApp.java
mobile/android/base/preferences/GeckoPreferences.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -168,18 +168,16 @@ public class BrowserApp extends GeckoApp
                                    OnUrlOpenListener,
                                    OnUrlOpenInBackgroundListener,
                                    ReadingListHelper.OnReadingListEventListener,
                                    AnchoredPopup.OnVisibilityChangeListener,
                                    ActionModeCompat.Presenter,
                                    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";
     public static final String GUEST_BROWSING_ARG = "--guest";
 
     private static final String STATE_ABOUT_HOME_TOP_PADDING = "abouthome_top_padding";
 
     private static final String BROWSER_SEARCH_TAG = "browser_search";
@@ -741,20 +739,18 @@ public class BrowserApp extends GeckoApp
             public void onEnabledChanged(boolean enabled) {
                 setDynamicToolbarEnabled(enabled);
             }
         });
 
         // 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();
     }
 
     /**
      * Check and show the firstrun pane if the browser has never been launched and
      * is not opening an external link from another application.
      *
      * @param context Context of application; used to show firstrun pane if appropriate
      * @param intent Intent that launched this activity
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -694,23 +694,16 @@ OnSharedPreferenceChangeListener
             } else {
                 pref.setOnPreferenceChangeListener(this);
                 if (PREFS_UPDATER_AUTODOWNLOAD.equals(key)) {
                     if (!AppConstants.MOZ_UPDATER) {
                         preferences.removePreference(pref);
                         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)) {
                         preferences.removePreference(pref);
                         i--;
                         continue;
                     }
                 } else if (PREFS_TRACKING_PROTECTION.equals(key)) {