Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbaaeb65 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ida1671f2054b1df3928169f01cd8e2dbd7a5e9de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57f5d29c 7356d99d

core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java

+14 −5
Original line number Diff line number Diff line
@@ -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() {