@@ -37,13 +37,11 @@ class PixelUtilTest {
3737 @Before
3838 fun setUp () {
3939 context = RuntimeEnvironment .getApplication()
40- DisplayMetricsHolder .setWindowDisplayMetrics(null )
4140 DisplayMetricsHolder .setScreenDisplayMetrics(null )
4241 }
4342
4443 @After
4544 fun tearDown () {
46- DisplayMetricsHolder .setWindowDisplayMetrics(null )
4745 DisplayMetricsHolder .setScreenDisplayMetrics(null )
4846 }
4947
@@ -57,7 +55,6 @@ class PixelUtilTest {
5755 displayMetrics.heightPixels = 1920
5856 displayMetrics.densityDpi = DisplayMetrics .DENSITY_XXHIGH
5957
60- DisplayMetricsHolder .setWindowDisplayMetrics(displayMetrics)
6158 DisplayMetricsHolder .setScreenDisplayMetrics(displayMetrics)
6259
6360 // Test that toPixelFromSP respects fontScale < 1.0
@@ -80,7 +77,6 @@ class PixelUtilTest {
8077 displayMetrics.heightPixels = 1920
8178 displayMetrics.densityDpi = DisplayMetrics .DENSITY_XXHIGH
8279
83- DisplayMetricsHolder .setWindowDisplayMetrics(displayMetrics)
8480 DisplayMetricsHolder .setScreenDisplayMetrics(displayMetrics)
8581
8682 // Test that toPixelFromSP respects fontScale > 1.0
@@ -103,7 +99,6 @@ class PixelUtilTest {
10399 displayMetrics.heightPixels = 1920
104100 displayMetrics.densityDpi = DisplayMetrics .DENSITY_XXHIGH
105101
106- DisplayMetricsHolder .setWindowDisplayMetrics(displayMetrics)
107102 DisplayMetricsHolder .setScreenDisplayMetrics(displayMetrics)
108103
109104 // Test that maxFontScale limits the scaling
@@ -128,7 +123,6 @@ class PixelUtilTest {
128123 displayMetrics.heightPixels = 1920
129124 displayMetrics.densityDpi = DisplayMetrics .DENSITY_XXHIGH
130125
131- DisplayMetricsHolder .setWindowDisplayMetrics(displayMetrics)
132126 DisplayMetricsHolder .setScreenDisplayMetrics(displayMetrics)
133127
134128 // Test that maxFontScale doesn't prevent scaling down
0 commit comments