Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(non linear font scaling): fix activity test flakiness" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-17 20:39:57 +00:00
committed by Android (Google) Code Review
parent 4cb8be09bc 3b4d13eafe
commit f197ae41de
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java
View File

@@ -50,6 +50,7 @@ import org.junit.Test;
import org.junit.rules.TestRule; import org.junit.rules.TestRule;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
/** /**
@@ -127,7 +128,7 @@ public class FontScaleConverterActivityTest {
}); });
} }
private static void setSystemFontScale(float fontScale) { private void setSystemFontScale(float fontScale) {
ShellIdentityUtils.invokeWithShellPermissions(() -> { ShellIdentityUtils.invokeWithShellPermissions(() -> {
Settings.System.putFloat( Settings.System.putFloat(
InstrumentationRegistry.getInstrumentation().getContext().getContentResolver(), InstrumentationRegistry.getInstrumentation().getContext().getContentResolver(),
@@ -136,14 +137,22 @@ public class FontScaleConverterActivityTest {
); );
}); });
PollingCheck.waitFor(/* timeout= */ 5000, () -> PollingCheck.waitFor(/* timeout= */ 5000, () -> {
InstrumentationRegistry AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);
rule.getScenario().onActivity(activity ->
isActivityAtCorrectScale.set(
activity.getResources()
.getConfiguration()
.fontScale == fontScale
)
);
return isActivityAtCorrectScale.get() && InstrumentationRegistry
.getInstrumentation() .getInstrumentation()
.getContext() .getContext()
.getResources() .getResources()
.getConfiguration() .getConfiguration()
.fontScale == fontScale .fontScale == fontScale;
); });
} }
private static void restoreSystemFontScaleToDefault() { private static void restoreSystemFontScaleToDefault() {