diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java index 8400527f6f..e4d9c7ee22 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java @@ -24,11 +24,6 @@ public class PixelUtil { return toPixelFromDIP((float) value); } - /** Convert from PX to SP */ - public static float toSPFromPixel(float value) { - return value / DisplayMetricsHolder.getScreenDisplayMetrics().scaledDensity; - } - /** Convert from SP to PX */ public static float toPixelFromSP(float value) { return toPixelFromSP(value, Float.NaN); @@ -58,6 +53,6 @@ public class PixelUtil { /** @return {@link float} that represents the density of the display metrics for device screen. */ public static float getDisplayMetricDensity() { - return DisplayMetricsHolder.getScreenDisplayMetrics().density; + return DisplayMetricsHolder.getWindowDisplayMetrics().density; } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java index bbb57f87e8..18b34eaf5b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java @@ -493,16 +493,16 @@ public class TextLayoutManager { // The attachment array returns the positions of each of the attachments as attachmentsPositions[attachmentPosition] = - PixelUtil.toSPFromPixel(placeholderTopPosition); + PixelUtil.toDIPFromPixel(placeholderTopPosition); attachmentsPositions[attachmentPosition + 1] = - PixelUtil.toSPFromPixel(placeholderLeftPosition); + PixelUtil.toDIPFromPixel(placeholderLeftPosition); attachmentIndex++; } } } - float widthInSP = PixelUtil.toSPFromPixel(calculatedWidth); - float heightInSP = PixelUtil.toSPFromPixel(calculatedHeight); + float widthInSP = PixelUtil.toDIPFromPixel(calculatedWidth); + float heightInSP = PixelUtil.toDIPFromPixel(calculatedHeight); if (ENABLE_MEASURE_LOGGING) { FLog.e( diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java index 422d986a63..0e15307b86 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java @@ -514,16 +514,16 @@ public class TextLayoutManagerMapBuffer { // The attachment array returns the positions of each of the attachments as attachmentsPositions[attachmentPosition] = - PixelUtil.toSPFromPixel(placeholderTopPosition); + PixelUtil.toDIPFromPixel(placeholderTopPosition); attachmentsPositions[attachmentPosition + 1] = - PixelUtil.toSPFromPixel(placeholderLeftPosition); + PixelUtil.toDIPFromPixel(placeholderLeftPosition); attachmentIndex++; } } } - float widthInSP = PixelUtil.toSPFromPixel(calculatedWidth); - float heightInSP = PixelUtil.toSPFromPixel(calculatedHeight); + float widthInSP = PixelUtil.toDIPFromPixel(calculatedWidth); + float heightInSP = PixelUtil.toDIPFromPixel(calculatedHeight); if (ENABLE_MEASURE_LOGGING) { FLog.e(