From b8b610347fbbc7cea52ced90f150933e38a73920 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Sun, 2 Aug 2015 11:42:18 -0400
Subject: [PATCH] fixed full-screen mode when watching a video in full-screen

---
 .../lightning/activity/BrowserActivity.java   | 55 ++++++++++++-------
 .../lightning/activity/ThemableActivity.java  |  4 +-
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
index d405347..5fe4314 100644
--- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
@@ -145,6 +145,7 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
     private LightningView mCurrentView;
     private WebView mWebView;
 
+    // Views
     private AnimatedProgressBar mProgressBar;
     private AutoCompleteTextView mSearch;
     private ImageView mArrowImage, mBookmarkTitleImage, mBookmarkImage;
@@ -166,7 +167,11 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
     private Activity mActivity;
 
     // Primatives
-    private boolean mSystemBrowser = false, mIsNewIntent = false, mFullScreen, mColorMode, mDarkTheme;
+    private boolean mFullScreen, mColorMode, mDarkTheme,
+            mSystemBrowser = false,
+            mIsNewIntent = false,
+            mIsFullScreen = false,
+            mIsImmersive = false;
     private int mOriginalOrientation, mBackgroundColor, mIdGenerator, mIconColor;
     private String mSearchText, mUntitledTitle, mHomepage, mCameraPhotoPath;
 
@@ -658,12 +663,7 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
             if (mWebView != null)
                 mWebView.setTranslationY(0);
         }
-        if (mPreferences.getHideStatusBarEnabled()) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        } else {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
+        setFullscreen(mPreferences.getHideStatusBarEnabled(), false);
 
         switch (mPreferences.getSearchChoice()) {
             case 0:
@@ -2252,7 +2252,7 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
         mCustomView = view;
         mFullscreenContainer.addView(mCustomView, COVER_SCREEN_PARAMS);
         decor.addView(mFullscreenContainer, COVER_SCREEN_PARAMS);
-        setFullscreen(true);
+        setFullscreen(true, true);
         mCurrentView.setVisibility(View.GONE);
         if (view instanceof FrameLayout) {
             if (((FrameLayout) view).getFocusedChild() instanceof VideoView) {
@@ -2276,7 +2276,7 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
         } catch (SecurityException e) {
             Log.e(Constants.TAG, "WebView is not allowed to keep the screen on");
         }
-        setFullscreen(mPreferences.getHideStatusBarEnabled());
+        setFullscreen(mPreferences.getHideStatusBarEnabled(), false);
         FrameLayout decor = (FrameLayout) getWindow().getDecorView();
         if (decor != null) {
             decor.removeView(mFullscreenContainer);
@@ -2314,26 +2314,39 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
 
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if (hasFocus) {
+            setFullscreen(mIsFullScreen, mIsImmersive);
+        }
+    }
+
     /**
      * turns on fullscreen mode in the app
      *
      * @param enabled whether to enable fullscreen or not
      */
-    private void setFullscreen(boolean enabled) {
-        Window win = getWindow();
-        WindowManager.LayoutParams winParams = win.getAttributes();
-        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+    private void setFullscreen(boolean enabled, boolean immersive) {
+        mIsFullScreen = enabled;
+        mIsImmersive = immersive;
+        Window window = getWindow();
+        View decor = window.getDecorView();
         if (enabled) {
-            winParams.flags |= bits;
-        } else {
-            winParams.flags &= ~bits;
-            if (mCustomView != null) {
-                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-            } else {
-                mBrowserFrame.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            if (immersive) {
+                decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
             }
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
         }
-        win.setAttributes(winParams);
     }
 
     /**
diff --git a/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java
index 443baab..badd3eb 100644
--- a/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java
@@ -33,6 +33,8 @@ public abstract class ThemableActivity extends AppCompatActivity {
     }
 
     private void restart() {
-        recreate();
+        Intent intent = getIntent();
+        finish();
+        startActivity(intent);
     }
 }