Skip to content

Commit ab73961

Browse files
committed
Revert "Fix Dimensions window values on Android < 15 (#47554)"
This reverts commit 9c4da7b.
1 parent c7cd66c commit ab73961

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

packages/react-native/ReactAndroid/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ dependencies {
620620
api(libs.androidx.autofill)
621621
api(libs.androidx.swiperefreshlayout)
622622
api(libs.androidx.tracing)
623-
api(libs.androidx.window)
624623

625624
api(libs.fbjni)
626625
api(libs.fresco)

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ import android.util.DisplayMetrics
1313
import android.view.WindowManager
1414
import androidx.core.view.ViewCompat
1515
import androidx.core.view.WindowInsetsCompat
16-
import androidx.window.layout.WindowMetricsCalculator
1716
import com.facebook.react.bridge.WritableMap
1817
import com.facebook.react.bridge.WritableNativeMap
19-
import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
2018

2119
/**
2220
* Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -64,28 +62,16 @@ public object DisplayMetricsHolder {
6462
@JvmStatic
6563
public fun initDisplayMetrics(context: Context) {
6664
val displayMetrics = context.resources.displayMetrics
67-
val windowDisplayMetrics = DisplayMetrics()
65+
windowDisplayMetrics = displayMetrics
6866
val screenDisplayMetrics = DisplayMetrics()
69-
70-
windowDisplayMetrics.setTo(displayMetrics)
7167
screenDisplayMetrics.setTo(displayMetrics)
72-
73-
if (isEdgeToEdgeFeatureFlagOn) {
74-
WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(context).let {
75-
windowDisplayMetrics.widthPixels = it.bounds.width()
76-
windowDisplayMetrics.heightPixels = it.bounds.height()
77-
}
78-
}
79-
8068
val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
8169
// Get the real display metrics if we are using API level 17 or higher.
8270
// The real metrics include system decor elements (e.g. soft menu bar).
8371
//
8472
// See:
8573
// http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
8674
@Suppress("DEPRECATION") wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
87-
88-
DisplayMetricsHolder.windowDisplayMetrics = windowDisplayMetrics
8975
DisplayMetricsHolder.screenDisplayMetrics = screenDisplayMetrics
9076
}
9177

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ androidx-swiperefreshlayout = "1.1.0"
1616
androidx-test = "1.5.0"
1717
androidx-test-junit = "1.2.1"
1818
androidx-tracing = "1.1.0"
19-
androidx-window = "1.4.0"
2019
assertj = "3.21.0"
2120
binary-compatibility-validator = "0.13.2"
2221
download = "5.4.0"
@@ -64,7 +63,6 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-
6463
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
6564
androidx-tracing = { module = "androidx.tracing:tracing", version.ref = "androidx-tracing" }
6665
androidx-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
67-
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
6866

6967
fbjni = { module = "com.facebook.fbjni:fbjni", version.ref = "fbjni" }
7068
fresco = { module = "com.facebook.fresco:fresco", version.ref = "fresco" }

0 commit comments

Comments
 (0)