Remove isDeviceRunningEdgeToEdge

Author: zoontek

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt

@@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.DisplayMetricsHolder.getDisplayMetricsWritableMap
 import com.facebook.react.uimanager.DisplayMetricsHolder.initDisplayMetricsIfNotInitialized
-import com.facebook.react.views.view.isDeviceRunningEdgeToEdge
+import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 
 /** Module that exposes Android Constants to JS. */
 @ReactModule(name = NativeDeviceInfoSpec.NAME)
@@ -38,7 +38,7 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
 
     return mapOf(
         "Dimensions" to displayMetrics.toHashMap(),
-        "isEdgeToEdge" to isDeviceRunningEdgeToEdge,
+        "isEdgeToEdge" to isEdgeToEdgeFeatureFlagOn,
     )
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt

@@ -23,7 +23,7 @@ import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.DisplayMetricsHolder.getStatusBarHeightPx
 import com.facebook.react.uimanager.PixelUtil
-import com.facebook.react.views.view.isDeviceRunningEdgeToEdge
+import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 import com.facebook.react.views.view.setStatusBarTranslucency
 import com.facebook.react.views.view.setStatusBarVisibility
 
@@ -56,7 +56,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
       )
       return
     }
-    if (isDeviceRunningEdgeToEdge) {
+    if (isEdgeToEdgeFeatureFlagOn) {
       FLog.w(
           ReactConstants.TAG,
           "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.",
@@ -93,7 +93,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
       )
       return
     }
-    if (isDeviceRunningEdgeToEdge) {
+    if (isEdgeToEdgeFeatureFlagOn) {
       FLog.w(
           ReactConstants.TAG,
           "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.",

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -53,7 +53,7 @@ import com.facebook.react.views.common.ContextUtils
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.disableEdgeToEdge
 import com.facebook.react.views.view.enableEdgeToEdge
-import com.facebook.react.views.view.isDeviceRunningEdgeToEdge
+import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 import com.facebook.react.views.view.setStatusBarTranslucency
 
 /**
@@ -81,17 +81,17 @@ public class ReactModalHostView(context: ThemedReactContext) :
   public var onRequestCloseListener: OnRequestCloseListener? = null
 
   public var statusBarTranslucent: Boolean = false
-    get() = field || isDeviceRunningEdgeToEdge
+    get() = field || isEdgeToEdgeFeatureFlagOn
     set(value) {
       field = value
-      createNewDialog = createNewDialog || !isDeviceRunningEdgeToEdge
+      createNewDialog = createNewDialog || !isEdgeToEdgeFeatureFlagOn
     }
 
   public var navigationBarTranslucent: Boolean = false
-    get() = field || isDeviceRunningEdgeToEdge
+    get() = field || isEdgeToEdgeFeatureFlagOn
     set(value) {
       field = value
-      createNewDialog = createNewDialog || !isDeviceRunningEdgeToEdge
+      createNewDialog = createNewDialog || !isEdgeToEdgeFeatureFlagOn
     }
 
   public var animationType: String? = null
@@ -428,7 +428,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
       val dialogWindowInsetsController =
           WindowInsetsControllerCompat(dialogWindow, dialogWindow.decorView)
 
-      if (isDeviceRunningEdgeToEdge) {
+      if (isEdgeToEdgeFeatureFlagOn) {
         activityWindowInsetsController.systemBarsBehavior =
             WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
         dialogWindowInsetsController.systemBarsBehavior =

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt

@@ -28,15 +28,6 @@ internal val LightNavigationBarColor = Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
 // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/remote_color_resources_res/values/colors.xml;l=67
 internal val DarkNavigationBarColor = Color.argb(0x80, 0x1b, 0x1b, 0x1b)
 
-/**
- * Whether edge-to-edge is enforced. Computed once in [initEdgeToEdge], based on:
- * - The edge-to-edge feature flag has been explicitly enabled
- * - The device is running Android 16+ with targetSdk 35+ (where edge-to-edge is always enforced)
- * - The device is running Android 15 with targetSdk 35+ without opting out
- */
-internal var isDeviceRunningEdgeToEdge: Boolean = false
-  private set
-
 /**
  * This does not enable or apply edge-to-edge behavior, it simply tracks whether it has been flagged
  * as enabled elsewhere in the application.
@@ -49,23 +40,27 @@ public fun setEdgeToEdgeFeatureFlagOn() {
 }
 
 internal fun initEdgeToEdge(activity: Activity) {
-  isDeviceRunningEdgeToEdge =
-      when {
-        !AndroidVersion.isAtLeastTargetSdk35(activity) -> isEdgeToEdgeFeatureFlagOn
-        Build.VERSION.SDK_INT >= AndroidVersion.VERSION_CODE_BAKLAVA -> true
-        else -> {
-          val attributes = intArrayOf(AndroidVersion.ATTR_WINDOW_OPT_OUT_EDGE_TO_EDGE_ENFORCEMENT)
-          val typedArray = activity.theme.obtainStyledAttributes(attributes)
-
+  // When the app targets SDK 35+, edge-to-edge may be enforced by the OS even if the
+  // feature flag wasn't explicitly set. In that case, turn the flag on to match.
+  if (AndroidVersion.isAtLeastTargetSdk35(activity)) {
+    if (Build.VERSION.SDK_INT >= AndroidVersion.VERSION_CODE_BAKLAVA) {
+      // The device is running Android 16+ (where edge-to-edge is always enforced)
+      isEdgeToEdgeFeatureFlagOn = true
+    } else {
+      val attributes = intArrayOf(AndroidVersion.ATTR_WINDOW_OPT_OUT_EDGE_TO_EDGE_ENFORCEMENT)
+      val typedArray = activity.theme.obtainStyledAttributes(attributes)
+
+      // The device is running Android 15 with / without opting out
+      isEdgeToEdgeFeatureFlagOn =
           try {
             !typedArray.getBoolean(0, false)
           } finally {
             typedArray.recycle()
           }
-        }
-      }
+    }
+  }
 
-  if (isDeviceRunningEdgeToEdge) {
+  if (isEdgeToEdgeFeatureFlagOn) {
     activity.window.enableEdgeToEdge()
   }
 }
@@ -100,7 +95,7 @@ internal fun Window.setStatusBarVisibility(isHidden: Boolean) {
 
 @Suppress("DEPRECATION")
 private fun Window.statusBarHide() {
-  if (isDeviceRunningEdgeToEdge) {
+  if (isEdgeToEdgeFeatureFlagOn) {
     WindowInsetsControllerCompat(this, decorView).run {
       systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
       hide(WindowInsetsCompat.Type.statusBars())
@@ -119,7 +114,7 @@ private fun Window.statusBarHide() {
 
 @Suppress("DEPRECATION")
 private fun Window.statusBarShow() {
-  if (isDeviceRunningEdgeToEdge) {
+  if (isEdgeToEdgeFeatureFlagOn) {
     WindowInsetsControllerCompat(this, decorView).run {
       systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
       show(WindowInsetsCompat.Type.statusBars())