commit 8586d13ed896a69fe7657809605509b06fd3e935
author Tyler Freeman <fuego@google.com> Thu Dec 01 19:49:43 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 01 20:13:48 2022 +0000
tree 1638e3b861a353d664227d5b65232c919f507e02
parent a73e45f57f028493d13c1e602cb6625049aab6ed

Revert "feat(non linear font scaling): add CTS test to verify no..."

Revert "feat(non linear font scaling)!: add FontScaleConverter f..."

Revert "feat(non linear font scaling): support up to 200% font s..."

Revert submission 20003379-fontscaling

Reason for revert: Causing SysUi crash b/260984829
Reverted Changes:
I8d4131cb0:feat(non linear font scaling): add CTS test to ver...
I17d67252b:feat(non linear font scaling)!: add FontScaleConve...
Ie8d5495d4:feat(non linear font scaling): support up to 200% ...

Change-Id: I7a541804590fcef812ca65fe4e6cf6f855e831c4
(cherry picked from commit 0049b86b8cd9f98d3e54f39895dadd069bff6c65)
Merged-In: I7a541804590fcef812ca65fe4e6cf6f855e831c4

tests/tests/content/src/android/content/res/cts/ResourcesTest.java

diff --git a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
index d48cf3a..99dfe58 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -16,8 +16,6 @@
 
 package android.content.res.cts;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import android.content.Context;
 import android.content.cts.R;
 import android.content.cts.util.XmlUtils;
@@ -53,7 +51,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
-import java.util.stream.IntStream;
 
 public class ResourcesTest extends AndroidTestCase {
     private static final String CONFIG_VARYING = "configVarying";
@@ -62,7 +59,6 @@
     private static final String PACKAGE_NAME = "android.content.cts";
     private static final String COM_ANDROID_CTS_STUB_IDENTIFIER =
                 "android.content.cts:configVarying/simple";
-    public static final float FONT_SCALING_TOLERANCE = 0.05f;
     private Resources mResources;
 
     @Override
@@ -302,30 +298,6 @@
         assertEquals(LocaleList.getDefault(), res.getConfiguration().getLocales());
     }
 
-    public void testUpdateConfiguration_fontScaleIs1DoesNotUseAdaptiveFontScaling() {
-        Resources res = createNewResources();
-        final DisplayMetrics metrics1x = res.getDisplayMetrics();
-
-        assertThat(metrics1x.scaledDensity).isEqualTo(metrics1x.density);
-        // Verify all font sizes are not scaled
-        IntStream.range(5, 20)
-                .asDoubleStream()
-                .forEach(
-                        spDouble -> {
-                            float sp = (float) spDouble;
-                            // DP and SP should be same at font scale factor 1.0
-                            float pxExpected = dpToPx(sp, metrics1x);
-                            float pxActual = spToPx(sp, metrics1x);
-                            assertThat(pxActual).isWithin(FONT_SCALING_TOLERANCE).of(pxExpected);
-                        });
-        assertThat(spToPx(30f, metrics1x))
-                .isWithin(FONT_SCALING_TOLERANCE)
-                .of(dpToPx(30f, metrics1x));
-        assertThat(spToPx(100f, metrics1x))
-                .isWithin(FONT_SCALING_TOLERANCE)
-                .of(dpToPx(100f, metrics1x));
-    }
-
     public void testGetDimensionPixelSize() {
         try {
             mResources.getDimensionPixelSize(-1);
@@ -1094,12 +1066,4 @@
         assertFalse(t1.equals(t2));
         assertFalse(t1.hashCode() == t2.hashCode());
     }
-
-    private static float spToPx(float sp, DisplayMetrics metrics) {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, metrics);
-    }
-
-    private static float dpToPx(float dp, DisplayMetrics metrics) {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, metrics);
-    }
 }