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 am: f197ae41de

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23265636

Change-Id: I9b583cd7ea215225da39eb804f7e6b75ad17b065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-17 20:45:31 +00:00
committed by Automerger Merge Worker
parent 98c2c5826e f197ae41de
commit 69350e1b2b
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.runner.RunWith;
import java.util.concurrent.atomic.AtomicBoolean;
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(() -> {
Settings.System.putFloat(
InstrumentationRegistry.getInstrumentation().getContext().getContentResolver(),
@@ -136,14 +137,22 @@ public class FontScaleConverterActivityTest {
);
});
PollingCheck.waitFor(/* timeout= */ 5000, () ->
InstrumentationRegistry
PollingCheck.waitFor(/* timeout= */ 5000, () -> {
AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);
rule.getScenario().onActivity(activity ->
isActivityAtCorrectScale.set(
activity.getResources()
.getConfiguration()
.fontScale == fontScale
)
);
return isActivityAtCorrectScale.get() && InstrumentationRegistry
.getInstrumentation()
.getContext()
.getResources()
.getConfiguration()
.fontScale == fontScale
);
.fontScale == fontScale;
});
}
private static void restoreSystemFontScaleToDefault() {