Skip to content

Commit dad4ed8

Browse files
committed
Pick #56055
# Conflicts: # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt
1 parent 6bca7b9 commit dad4ed8

6 files changed

Lines changed: 15 additions & 18 deletions

File tree

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateEntryPointTask.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ abstract class GenerateEntryPointTask : DefaultTask() {
9797
DefaultNewArchitectureEntryPoint.load();
9898
}
9999
100-
if ({{packageName}}.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
101-
WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
102-
}
100+
WindowUtilKt.initEdgeToEdge(context, {{packageName}}.BuildConfig.IS_EDGE_TO_EDGE_ENABLED);
103101
}
104102
}
105103
"""

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateEntryPointTaskTest.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ class GenerateEntryPointTaskTest {
8080
DefaultNewArchitectureEntryPoint.load();
8181
}
8282
83-
if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
84-
WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
85-
}
83+
WindowUtilKt.initEdgeToEdge(context, com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED);
8684
}
8785
}
8886
"""

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6542,7 +6542,8 @@ public final class com/facebook/react/views/view/ReactViewManager$Companion {
65426542

65436543
public final class com/facebook/react/views/view/WindowUtilKt {
65446544
public static final fun isEdgeToEdgeFeatureFlagOn ()Z
6545-
public static final fun setEdgeToEdgeFeatureFlagOn ()V
6545+
public static final fun isEdgeToEdge ()Z
6546+
public static final fun initEdgeToEdge (Landroid/content/Context;Z)V
65466547
}
65476548

65486549
public final class com/facebook/react/views/virtual/VirtualViewMode : java/lang/Enum {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.facebook.react.bridge.WritableNativeMap
2222
import com.facebook.react.module.annotations.ReactModule
2323
import com.facebook.react.uimanager.DisplayMetricsHolder.getScreenDisplayMetrics
2424
import com.facebook.react.uimanager.DisplayMetricsHolder.initDisplayMetricsIfNotInitialized
25-
import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
25+
import com.facebook.react.views.view.isEdgeToEdge
2626

2727
/** Module that exposes Android Constants to JS. */
2828
@ReactModule(name = NativeDeviceInfoSpec.NAME)
@@ -91,7 +91,7 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
9191

9292
return mapOf(
9393
"Dimensions" to displayMetrics.toHashMap(),
94-
"isEdgeToEdge" to isEdgeToEdgeFeatureFlagOn,
94+
"isEdgeToEdge" to isEdgeToEdge,
9595
)
9696
}
9797

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.facebook.react.common.ReactConstants
2323
import com.facebook.react.module.annotations.ReactModule
2424
import com.facebook.react.uimanager.DisplayMetricsHolder.getStatusBarHeightPx
2525
import com.facebook.react.uimanager.PixelUtil
26-
import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
26+
import com.facebook.react.views.view.isEdgeToEdge
2727
import com.facebook.react.views.view.setStatusBarTranslucency
2828
import com.facebook.react.views.view.setStatusBarVisibility
2929

@@ -56,7 +56,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
5656
)
5757
return
5858
}
59-
if (isEdgeToEdgeFeatureFlagOn) {
59+
if (isEdgeToEdge) {
6060
FLog.w(
6161
ReactConstants.TAG,
6262
"StatusBarModule: Ignored status bar change, current activity is edge-to-edge.",
@@ -93,7 +93,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
9393
)
9494
return
9595
}
96-
if (isEdgeToEdgeFeatureFlagOn) {
96+
if (isEdgeToEdge) {
9797
FLog.w(
9898
ReactConstants.TAG,
9999
"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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import com.facebook.react.views.common.ContextUtils
5353
import com.facebook.react.views.view.ReactViewGroup
5454
import com.facebook.react.views.view.disableEdgeToEdge
5555
import com.facebook.react.views.view.enableEdgeToEdge
56-
import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
56+
import com.facebook.react.views.view.isEdgeToEdge
5757
import com.facebook.react.views.view.setStatusBarTranslucency
5858

5959
/**
@@ -81,17 +81,17 @@ public class ReactModalHostView(context: ThemedReactContext) :
8181
public var onRequestCloseListener: OnRequestCloseListener? = null
8282

8383
public var statusBarTranslucent: Boolean = false
84-
get() = field || isEdgeToEdgeFeatureFlagOn
84+
get() = field || isEdgeToEdge
8585
set(value) {
8686
field = value
87-
createNewDialog = createNewDialog || !isEdgeToEdgeFeatureFlagOn
87+
createNewDialog = createNewDialog || !isEdgeToEdge
8888
}
8989

9090
public var navigationBarTranslucent: Boolean = false
91-
get() = field || isEdgeToEdgeFeatureFlagOn
91+
get() = field || isEdgeToEdge
9292
set(value) {
9393
field = value
94-
createNewDialog = createNewDialog || !isEdgeToEdgeFeatureFlagOn
94+
createNewDialog = createNewDialog || !isEdgeToEdge
9595
}
9696

9797
public var animationType: String? = null
@@ -428,7 +428,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
428428
val dialogWindowInsetsController =
429429
WindowInsetsControllerCompat(dialogWindow, dialogWindow.decorView)
430430

431-
if (isEdgeToEdgeFeatureFlagOn) {
431+
if (isEdgeToEdge) {
432432
activityWindowInsetsController.systemBarsBehavior =
433433
WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
434434
dialogWindowInsetsController.systemBarsBehavior =

0 commit comments

Comments
 (0)