diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt index f7ad6ca5b35b..c18e7485f43d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt @@ -20,7 +20,7 @@ public object PixelUtil { } return TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, value, DisplayMetricsHolder.getWindowDisplayMetrics()) + TypedValue.COMPLEX_UNIT_DIP, value, DisplayMetricsHolder.getScreenDisplayMetrics()) } /** Convert from DIP to PX */ @@ -37,7 +37,7 @@ public object PixelUtil { return Float.NaN } - val displayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics() + val displayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics() val scaledValue = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, value, displayMetrics) if (maxFontScale >= 1) { @@ -60,13 +60,13 @@ public object PixelUtil { return Float.NaN } - return value / DisplayMetricsHolder.getWindowDisplayMetrics().density + return value / DisplayMetricsHolder.getScreenDisplayMetrics().density } /** @return [Float] that represents the density of the display metrics for device screen. */ @JvmStatic public fun getDisplayMetricDensity(): Float = - DisplayMetricsHolder.getWindowDisplayMetrics().density + DisplayMetricsHolder.getScreenDisplayMetrics().density /* Kotlin extensions */ public fun Int.dpToPx(): Float = toPixelFromDIP(this.toFloat()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt index be6989654454..ae163e961e85 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt @@ -467,7 +467,7 @@ class TouchEventDispatchTest { metrics.xdpi = 1f metrics.ydpi = 1f metrics.density = 1f - DisplayMetricsHolder.setWindowDisplayMetrics(metrics) + DisplayMetricsHolder.setScreenDisplayMetrics(metrics) val reactContext = ReactTestHelper.createCatalystContextForTest() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt index c3ad96bd30f9..98daafb86e30 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt @@ -25,7 +25,7 @@ class ColorStopTest { fun setUp() { val metrics = DisplayMetrics() metrics.density = 1f - DisplayMetricsHolder.setWindowDisplayMetrics(metrics) + DisplayMetricsHolder.setScreenDisplayMetrics(metrics) } @Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt index 9f6020002170..4c4501f13be6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt @@ -75,14 +75,14 @@ class ReactImagePropertyTest { context.initializeWithInstance(catalystInstanceMock) themeContext = ThemedReactContext(context, context, null, -1) Fresco.initialize(context) - DisplayMetricsHolder.setWindowDisplayMetrics(DisplayMetrics()) + DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) ReactNativeFeatureFlagsForTests.setUp() } @After fun teardown() { - DisplayMetricsHolder.setWindowDisplayMetrics(null) + DisplayMetricsHolder.setScreenDisplayMetrics(null) rnLog.close() flogMock.close() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 14c0ce0960be..0b05173cf1fe 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -65,7 +65,7 @@ class ReactTextInputPropertyTest { context.initializeWithInstance(catalystInstanceMock) themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL) manager = ReactTextInputManager() - DisplayMetricsHolder.setWindowDisplayMetrics(DisplayMetrics()) + DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) view = manager.createViewInstance(themedContext) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt index 75c6821e3aed..443b0d8b0aa9 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt @@ -47,7 +47,7 @@ class ReactVirtualViewTest { val displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) displayMetricsHolder - .`when` { DisplayMetricsHolder.getWindowDisplayMetrics() } + .`when` { DisplayMetricsHolder.getScreenDisplayMetrics() } .thenAnswer { DisplayMetrics().apply { density = 1f } } }