Perform fullscreen action on configuration changes

brave · Dec 16, 2024 · b66f4dc · b66f4dc
1 parent 7cd9559
commit b66f4dc
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -31,6 +31,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -63,6 +64,7 @@
 import com.wireguard.android.backend.GoBackend;
 
 import org.chromium.chrome.browser.util.TabUtils;
+import org.chromium.chrome.browser.youtube.YouTubeFeaturesLayout;
 import org.jni_zero.JNINamespace;
 import org.jni_zero.NativeMethods;
 
@@ -234,7 +236,6 @@
 import org.chromium.mojo.system.MojoException;
 import org.chromium.ui.KeyboardUtils;
 import org.chromium.ui.widget.Toast;
-import org.chromium.url.GURL;
 
 import java.util.Arrays;
 import java.util.Calendar;
@@ -518,28 +519,16 @@ protected void onDestroyInternal() {
         cleanUpWalletNativeServices();
         cleanUpMiscAndroidMetrics();
     }
-
-    @Override
-    public void onUserLeaveHint() {
-        super.onUserLeaveHint();
-        if (isActivityFinishingOrDestroyed()) return;
-        Tab currentTab = getActivityTab();
-        if (TabUtils.isYouTubeVideo(currentTab)
-                && !isInPictureInPictureMode()
-                && BackgroundVideoPlaybackTabHelper.isPlayingMedia(currentTab.getWebContents())) {
-            BackgroundVideoPlaybackTabHelper.setFullscreen(currentTab.getWebContents());
-            try {
-                enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
-            } catch (IllegalStateException | IllegalArgumentException e) {
-                Log.e(TAG, "Error while entering picture in picture mode", e);
-            }
-        }
-    }
-
     @Override
     public void performOnConfigurationChanged(Configuration newConfig) {
         super.performOnConfigurationChanged(newConfig);
 
+        YouTubeFeaturesLayout youtubeFeaturesLayout = findViewById(R.id.youtube_features_layout);
+        if (youtubeFeaturesLayout != null && youtubeFeaturesLayout.getLayoutParams() instanceof FrameLayout.LayoutParams params) {
+            params.bottomMargin = (int) getResources().getDimension(R.dimen.youtube_features_layout_margin_bottom);
+            params.leftMargin = (int) getResources().getDimension(R.dimen.youtube_features_layout_margin_left);
+        }
+
         Tab currentTab = getActivityTab();
         if (TabUtils.isYouTubeVideo(currentTab)
                 && !isInPictureInPictureMode()
@@ -548,6 +537,13 @@ public void performOnConfigurationChanged(Configuration newConfig) {
         }
     }
 
+    public void showYouTubeFeaturesLayout(final boolean show) {
+        YouTubeFeaturesLayout youtubeFeaturesLayout = findViewById(R.id.youtube_features_layout);
+        if (youtubeFeaturesLayout != null) {
+            youtubeFeaturesLayout.setVisibility(show ? View.VISIBLE : View.GONE);
+        }
+    }
+
     /**
      * Gets Wallet model for Brave activity. It may be {@code null} if native initialization has not
      * completed yet.