Skip to content

fix(android): use the context's display for display metrics, not the device default #56895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DouweBos wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

fix(android): use the context's display for display metrics, not the device default #56895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private void init() {
setClipChildren(false);

if (ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
DisplayMetricsHolder.initDisplayMetrics(getContext());
}
}

Expand Down Expand Up @@ -932,7 +932,7 @@ private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLay
private int mDeviceRotation = 0;

/* package */ CustomGlobalLayoutListener() {
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext().getApplicationContext());
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext());
mVisibleViewArea = new Rect();
}

Expand Down Expand Up @@ -1007,7 +1007,7 @@ private void checkForDeviceOrientationChanges() {
return;
}
mDeviceRotation = rotation;
DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
DisplayMetricsHolder.initDisplayMetrics(getContext());
emitOrientationChanged(rotation);
}

Expand Down
16 changes: 14 additions & 2 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ package com.facebook.react.uimanager
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.os.Build
import android.util.DisplayMetrics
import android.view.Display
import android.view.WindowManager
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
Expand Down Expand Up @@ -54,9 +56,19 @@ public object DisplayMetricsHolder {
val screenDisplayMetrics = DisplayMetrics()
screenDisplayMetrics.setTo(displayMetrics)
try {
val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
// Use the display the context is associated with, not the device's
// default display. They differ when the activity is running on a
// secondary display (Samsung DeX, desktop mode, external monitor,
// freeform window) — using the default display there reports the
// primary display's density/dimensions and breaks layout scaling.
val display: Display? =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
context.display
} else {
(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
}
// getRealMetrics includes system decor (e.g. nav bar) excluded from resource metrics.
wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
display?.getRealMetrics(screenDisplayMetrics)
} catch (_: Exception) {
// Non-visual contexts (e.g. Application) may throw on API 30+.
// Falls back to resource display metrics copied via setTo() above.
Expand Down