Revert "Revert of 📺 Move fullscreen web content to a new Activity. (patchset #11 id:200001 of https…

chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.fullscreen;
 
 import android.app.Activity;
 import android.content.res.Resources;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ skipping 31 matching lines @@
 
     // The amount of time to delay the control show request after returning to a once visible
     // activity.  This delay is meant to allow Android to run its Activity focusing animation and
     // have the controls scroll back in smoothly once that has finished.
     private static final long ACTIVITY_RETURN_SHOW_REQUEST_DELAY_MS = 100;
 
     private final Activity mActivity;
     private final Window mWindow;
     private final BrowserStateBrowserControlsVisibilityDelegate mBrowserVisibilityDelegate;
     private final boolean mIsBottomControls;
+    private final boolean mExitFullscreenOnStop;
 
     private ControlContainer mControlContainer;
     private int mTopControlContainerHeight;
     private int mBottomControlContainerHeight;
     private TabModelSelector mTabModelSelector;
     private TabModelSelectorTabModelObserver mTabModelObserver;
 
     private float mRendererTopControlOffset = Float.NaN;
     private float mRendererBottomControlOffset = Float.NaN;
     private float mRendererTopContentOffset;
     private float mPreviousContentOffset = Float.NaN;
     private float mControlOffsetRatio;
     private float mPreviousControlOffset;
     private boolean mIsEnteringPersistentModeState;
 
     private boolean mInGesture;
     private boolean mContentViewScrolling;
 
     private boolean mBrowserControlsPermanentlyHidden;
     private boolean mBrowserControlsAndroidViewHidden;
 
-    private final ArrayList<FullscreenListener> mListeners = new ArrayList<FullscreenListener>();
+    private final ArrayList<FullscreenListener> mListeners = new ArrayList<>();
 
     /**
      * A listener that gets notified of changes to the fullscreen state.
      */
     public interface FullscreenListener {
         /**
          * Called whenever the content's offset changes.
          * @param offset The new offset of the content from the top of the screen.
          */
         public void onContentOffsetChanged(float offset);
@@ skipping 32 matching lines @@
             mControlContainer.getView().requestLayout();
         }
     };
 
     /**
      * Creates an instance of the fullscreen mode manager.
      * @param activity The activity that supports fullscreen.
      * @param isBottomControls Whether or not the browser controls are at the bottom of the screen.
      */
     public ChromeFullscreenManager(Activity activity, boolean isBottomControls) {
+        this(activity, isBottomControls, true);
+    }
+
+    /**
+     * Creates an instance of the fullscreen mode manager.
+     * @param activity The activity that supports fullscreen.
+     * @param isBottomControls Whether or not the browser controls are at the bottom of the screen.
+     * @param exitFullscreenOnStop Whether fullscreen mode should exit on stop - should be
+     *                             true for Activities that are not always fullscreen.
+     */
+    public ChromeFullscreenManager(
+            Activity activity, boolean isBottomControls, boolean exitFullscreenOnStop) {
         super(activity.getWindow());
 
         mActivity = activity;
         mWindow = activity.getWindow();
         mIsBottomControls = isBottomControls;
+        mExitFullscreenOnStop = exitFullscreenOnStop;
         mBrowserVisibilityDelegate = new BrowserStateBrowserControlsVisibilityDelegate(
                 new Runnable() {
                     @Override
                     public void run() {
                         if (getTab() != null) {
                             getTab().updateFullscreenEnabledState();
                         } else if (!mBrowserVisibilityDelegate.isHidingBrowserControlsEnabled()) {
                             setPositionsForTabToNonFullscreen();
                         }
                     }
@@ skipping 80 matching lines @@
         if (tab != null && previousTab != getTab()) {
             mBrowserVisibilityDelegate.showControlsTransient();
         }
         if (tab == null && !mBrowserVisibilityDelegate.isHidingBrowserControlsEnabled()) {
             setPositionsForTabToNonFullscreen();
         }
     }
 
     @Override
     public void onActivityStateChange(Activity activity, int newState) {
-        if (newState == ActivityState.STOPPED) {
+        if (newState == ActivityState.STOPPED && mExitFullscreenOnStop) {
             // Exit fullscreen in onStop to ensure the system UI flags are set correctly when
             // showing again (on JB MR2+ builds, the omnibox would be covered by the
             // notification bar when this was done in onStart()).
             setPersistentFullscreenMode(false);
         } else if (newState == ActivityState.STARTED) {
             ThreadUtils.postOnUiThreadDelayed(new Runnable() {
                 @Override
                 public void run() {
                     mBrowserVisibilityDelegate.showControlsTransient();
                 }
@@ skipping 409 matching lines @@
             updateVisuals();
         }
     }
 
     @Override
     public void onContentViewScrollingStateChanged(boolean scrolling) {
         mContentViewScrolling = scrolling;
         if (!scrolling) updateVisuals();
     }
 }