Rollback changes

Author: zoontek

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

@@ -3286,10 +3286,8 @@ public final class com/facebook/react/uimanager/DisplayMetricsHolder {
 	public static final fun getDisplayMetricsWritableMap (D)Lcom/facebook/react/bridge/WritableMap;
 	public static final fun getScreenDisplayMetrics ()Landroid/util/DisplayMetrics;
 	public static final fun getWindowDisplayMetrics ()Landroid/util/DisplayMetrics;
-	public static final fun initScreenDisplayMetrics (Landroid/content/Context;)V
-	public static final fun initWindowDisplayMetrics (Landroid/content/Context;)V
-	public static final fun initScreenDisplayMetricsIfNotInitialized (Landroid/content/Context;)V
-	public static final fun initWindowDisplayMetricsIfNotInitialized (Landroid/content/Context;)V
+	public static final fun initDisplayMetrics (Landroid/content/Context;)V
+	public static final fun initDisplayMetricsIfNotInitialized (Landroid/content/Context;)V
 	public static final fun setScreenDisplayMetrics (Landroid/util/DisplayMetrics;)V
 	public static final fun setWindowDisplayMetrics (Landroid/util/DisplayMetrics;)V
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -241,11 +241,7 @@ public static ReactInstanceManagerBuilder builder() {
     FLog.d(TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
-    DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(applicationContext);
-
-    if (currentActivity != null) {
-      DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(currentActivity);
-    }
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(applicationContext);
 
     // See {@code ReactInstanceManagerBuilder} for description of all flags here.
     mApplicationContext = applicationContext;
@@ -873,13 +869,6 @@ public void onConfigurationChanged(Context updatedContext, @Nullable Configurati
 
     ReactContext currentReactContext = getCurrentReactContext();
     if (currentReactContext != null) {
-      DisplayMetricsHolder.initScreenDisplayMetrics(currentReactContext);
-      Activity currentActivity = currentReactContext.getCurrentActivity();
-
-      if (currentActivity != null) {
-        DisplayMetricsHolder.initWindowDisplayMetrics(currentActivity);
-      }
-
       AppearanceModule appearanceModule =
           currentReactContext.getNativeModule(AppearanceModule.class);
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -139,8 +139,9 @@ private void init() {
     setRootViewTag(ReactRootViewTagGenerator.getNextRootViewTag());
     setClipChildren(false);
 
-    DisplayMetricsHolder.initScreenDisplayMetrics(getContext());
-    DisplayMetricsHolder.initWindowDisplayMetrics(getContext());
+    if (ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
+    }
   }
 
   @Override
@@ -938,8 +939,7 @@ private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLay
     private int mDeviceRotation = 0;
 
     /* package */ CustomGlobalLayoutListener() {
-      DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(getContext());
-      DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(getContext());
+      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext().getApplicationContext());
       mVisibleViewArea = new Rect();
       mMinKeyboardHeightDetected = (int) PixelUtil.toPixelFromDIP(60);
     }
@@ -1062,8 +1062,7 @@ private void checkForDeviceOrientationChanges() {
         return;
       }
       mDeviceRotation = rotation;
-      DisplayMetricsHolder.initScreenDisplayMetrics(getContext());
-      DisplayMetricsHolder.initWindowDisplayMetrics(getContext());
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 

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

@@ -15,8 +15,7 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger
 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.initScreenDisplayMetricsIfNotInitialized
-import com.facebook.react.uimanager.DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized
+import com.facebook.react.uimanager.DisplayMetricsHolder.initDisplayMetricsIfNotInitialized
 import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 
 /** Module that exposes Android Constants to JS. */
@@ -27,8 +26,7 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
   private var previousDisplayMetrics: ReadableMap? = null
 
   init {
-    initScreenDisplayMetricsIfNotInitialized(reactContext)
-    reactContext.currentActivity?.let { initWindowDisplayMetricsIfNotInitialized(it) }
+    initDisplayMetricsIfNotInitialized(reactContext)
     reactContext.addLifecycleEventListener(this)
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -684,11 +684,9 @@ public class ReactHostImpl(
   override fun onConfigurationChanged(context: Context) {
     val currentReactContext = this.currentReactContext
     if (currentReactContext != null) {
-      DisplayMetricsHolder.initScreenDisplayMetrics(currentReactContext)
-      currentReactContext.currentActivity?.let { DisplayMetricsHolder.initWindowDisplayMetrics(it) }
-
       if (ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
         val previousFontScale = PixelUtil.toPixelFromSP(1.0)
+        DisplayMetricsHolder.initDisplayMetrics(currentReactContext)
         val newFontScale = PixelUtil.toPixelFromSP(1.0)
 
         if (previousFontScale != newFontScale) {
@@ -1002,7 +1000,6 @@ public class ReactHostImpl(
                 val instance =
                     ReactInstance(
                         reactContext,
-                        currentActivity,
                         reactHostDelegate,
                         componentFactory,
                         devSupportManager,

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.runtime
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.res.AssetManager
 import android.view.View
 import com.facebook.common.logging.FLog
@@ -90,7 +89,6 @@ import kotlin.collections.Collection
 @UnstableReactNativeAPI
 internal class ReactInstance(
     private val context: BridgelessReactContext,
-    private val activity: Activity?,
     delegate: ReactHostDelegate,
     componentFactory: ComponentFactory,
     devSupportManager: DevSupportManager,
@@ -259,8 +257,7 @@ internal class ReactInstance(
         FabricUIManager(context, ViewManagerRegistry(viewManagerResolver), eventBeatManager)
 
     // Misc initialization that needs to be done before Fabric init
-    DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(context)
-    activity?.let { DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(it) }
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
 
     val animationBackendChoreographer = AnimationBackendChoreographer(context)
 

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt

@@ -51,8 +51,7 @@ class RootViewTest {
     reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication()))
     reactContext.initializeWithInstance(catalystInstanceMock)
 
-    DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(reactContext)
-    DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(reactContext)
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext)
     val uiManagerModuleMock: UIManagerModule = mock()
     whenever(catalystInstanceMock.getNativeModule(UIManagerModule::class.java))
         .thenReturn(uiManagerModuleMock)

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/DisplayMetricsHolderTest.kt

@@ -90,35 +90,23 @@ class DisplayMetricsHolderTest {
   }
 
   @Test
-  fun initScreenDisplayMetrics_setsMetrics() {
-    DisplayMetricsHolder.initScreenDisplayMetrics(context)
-    assertThat(DisplayMetricsHolder.getScreenDisplayMetrics()).isNotNull()
-  }
-
-  @Test
-  fun initWindowDisplayMetrics_setsMetrics() {
-    DisplayMetricsHolder.initWindowDisplayMetrics(context)
+  fun initDisplayMetrics_setsMetrics() {
+    DisplayMetricsHolder.initDisplayMetrics(context)
     assertThat(DisplayMetricsHolder.getWindowDisplayMetrics()).isNotNull()
+    assertThat(DisplayMetricsHolder.getScreenDisplayMetrics()).isNotNull()
   }
 
   @Test
-  fun initScreenDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
-    DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(context)
-    val firstScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
-    // Should not reinitialize
-    DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(context)
-    val secondScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
-    assertThat(secondScreen).isEqualTo(firstScreen)
-  }
-
-  @Test
-  fun initWindowDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
-    DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(context)
+  fun initDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
     val firstWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
+    val firstScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
     // Should not reinitialize
-    DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(context)
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
     val secondWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
+    val secondScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
     assertThat(secondWindow).isEqualTo(firstWindow)
+    assertThat(secondScreen).isEqualTo(firstScreen)
   }
 
   @Test(expected = IllegalStateException::class)
@@ -129,8 +117,7 @@ class DisplayMetricsHolderTest {
   @Test
   fun getDisplayMetricsWritableMap_returnsCorrectMap() {
     // Use the official initialization method to ensure both metrics are set
-    DisplayMetricsHolder.initScreenDisplayMetrics(context)
-    DisplayMetricsHolder.initWindowDisplayMetrics(context)
+    DisplayMetricsHolder.initDisplayMetrics(context)
     val map: WritableMap = DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)
     assertThat(map.hasKey("windowPhysicalPixels")).isTrue()
     assertThat(map.hasKey("screenPhysicalPixels")).isTrue()
@@ -148,8 +135,7 @@ class DisplayMetricsHolderTest {
   @Test
   @RequiresApi(30)
   fun getEncodedScreenSizeWithoutVerticalInsets_returnsEncodedValue() {
-    DisplayMetricsHolder.initScreenDisplayMetrics(context)
-    DisplayMetricsHolder.initWindowDisplayMetrics(context)
+    DisplayMetricsHolder.initDisplayMetrics(context)
 
     val activity: Activity = mock()
     val window: Window = mock()

packages/react-native/gradle/libs.versions.toml

@@ -16,7 +16,7 @@ androidx-swiperefreshlayout = "1.1.0"
 androidx-test = "1.5.0"
 androidx-test-junit = "1.2.1"
 androidx-tracing = "1.1.0"
-androidx-window = "1.4.0"
+androidx-window = "1.5.1"
 assertj = "3.21.0"
 binary-compatibility-validator = "0.13.2"
 download = "5.4.0"