Skip to content

Commit b9d70ed

Browse files
alanleedevfacebook-github-bot
authored andcommitted
replace getWindowDisplayMetrics with getScreenDisplayMetrics
Summary: update `DisplayMetricsHolder.getWindowDisplayMetrics()` to `getScreenDisplayMetrics()`. Where window width and height is not needed, prefer to use `screenDisplayMetrics` as with upcoming diff `windowDisplayMetrics` initialization only happen using UiContext and have potential to cause more issues if used unnecessarily. Changelog: [Internal] Update `DisplayMetricsHolder.getWindowDisplayMetrics()` to use `.getScreenDisplayMetrics()` --- Differential Revision: D81270196
1 parent f06f9c9 commit b9d70ed

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public object PixelUtil {
2222
return TypedValue.applyDimension(
2323
TypedValue.COMPLEX_UNIT_DIP,
2424
value,
25-
DisplayMetricsHolder.getWindowDisplayMetrics(),
25+
DisplayMetricsHolder.getScreenDisplayMetrics(),
2626
)
2727
}
2828

@@ -40,7 +40,7 @@ public object PixelUtil {
4040
return Float.NaN
4141
}
4242

43-
val displayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics()
43+
val displayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics()
4444
val scaledValue = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, value, displayMetrics)
4545

4646
if (maxFontScale >= 1) {
@@ -63,13 +63,13 @@ public object PixelUtil {
6363
return Float.NaN
6464
}
6565

66-
return value / DisplayMetricsHolder.getWindowDisplayMetrics().density
66+
return value / DisplayMetricsHolder.getScreenDisplayMetrics().density
6767
}
6868

6969
/** @return [Float] that represents the density of the display metrics for device screen. */
7070
@JvmStatic
7171
public fun getDisplayMetricDensity(): Float =
72-
DisplayMetricsHolder.getWindowDisplayMetrics().density
72+
DisplayMetricsHolder.getScreenDisplayMetrics().density
7373

7474
/* Kotlin extensions */
7575
public fun Int.dpToPx(): Float = toPixelFromDIP(this.toFloat())

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class TouchEventDispatchTest {
514514
metrics.xdpi = 1f
515515
metrics.ydpi = 1f
516516
metrics.density = 1f
517-
DisplayMetricsHolder.setWindowDisplayMetrics(metrics)
517+
DisplayMetricsHolder.setScreenDisplayMetrics(metrics)
518518

519519
val reactContext = ReactTestHelper.createCatalystContextForTest()
520520

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ColorStopTest {
2525
fun setUp() {
2626
val metrics = DisplayMetrics()
2727
metrics.density = 1f
28-
DisplayMetricsHolder.setWindowDisplayMetrics(metrics)
28+
DisplayMetricsHolder.setScreenDisplayMetrics(metrics)
2929
}
3030

3131
@Test

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ class ReactImagePropertyTest {
7575
context.initializeWithInstance(catalystInstanceMock)
7676
themeContext = ThemedReactContext(context, context, null, -1)
7777
Fresco.initialize(context)
78-
DisplayMetricsHolder.setWindowDisplayMetrics(DisplayMetrics())
78+
DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())
7979

8080
ReactNativeFeatureFlagsForTests.setUp()
8181
}
8282

8383
@After
8484
fun teardown() {
85-
DisplayMetricsHolder.setWindowDisplayMetrics(null)
85+
DisplayMetricsHolder.setScreenDisplayMetrics(null)
8686
rnLog.close()
8787
flogMock.close()
8888
}

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class ReactTextInputPropertyTest {
6565
context.initializeWithInstance(catalystInstanceMock)
6666
themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL)
6767
manager = ReactTextInputManager()
68-
DisplayMetricsHolder.setWindowDisplayMetrics(DisplayMetrics())
68+
DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())
6969
view = manager.createViewInstance(themedContext)
7070
}
7171

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ReactVirtualViewTest {
4747

4848
val displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java)
4949
displayMetricsHolder
50-
.`when`<DisplayMetrics> { DisplayMetricsHolder.getWindowDisplayMetrics() }
50+
.`when`<DisplayMetrics> { DisplayMetricsHolder.getScreenDisplayMetrics() }
5151
.thenAnswer { DisplayMetrics().apply { density = 1f } }
5252
}
5353

0 commit comments

Comments
 (0)