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

Commit d8211818 authored by Candice's avatar Candice
Browse files

Remove light background related tests 

After switching the lightness detection from the view background colors
in ViewRootImpl to ColorArea calculation within hwui, we would like to
remove the view background related tests.

Bug: 368725782
Test: atest ViewRootImplTest
Flag: android.view.accessibility.force_invert_color
Change-Id: I0d7916b61168f315cd6d4963b2bed41e30881216
parent fa9d6da4

core/tests/coretests/src/android/view/ViewRootImplTest.java

+5 −44
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import android.annotation.NonNull; 
import android.app.Instrumentation;

import android.app.UiModeManager;

import android.content.Context;

import android.graphics.Color;

import android.graphics.ForceDarkType;

import android.graphics.Rect;

import android.hardware.display.DisplayManagerGlobal;
@@ -1478,14 +1477,12 @@ public class ViewRootImplTest { 


    @Test

    @EnableFlags(FLAG_FORCE_INVERT_COLOR)

    public void

            determineForceDarkType_isLightThemeAndIsLightBackground_returnsForceInvertColorDark()

            throws Exception {

    public void determineForceDarkType_isLightTheme_returnsForceInvertColorDark() throws Exception {

        // Set up configurations for force invert color

        waitForSystemNightModeActivated(true);

        enableForceInvertColor(true);



        setUpViewAttributes(/* isLightTheme= */ true, /* isLightBackground = */ true);

        setUpViewAttributes(/* isLightTheme= */ true);



        TestUtils.waitUntil("Waiting for ForceDarkType to be ready",

                () -> (mViewRootImpl.determineForceDarkType()
@@ -1494,43 +1491,12 @@ public class ViewRootImplTest { 


    @Test

    @EnableFlags(FLAG_FORCE_INVERT_COLOR)

    public void

            determineForceDarkType_isLightThemeAndNotLightBackground_returnsForceInvertColorDark()

            throws Exception {

        // Set up configurations for force invert color

        waitForSystemNightModeActivated(true);

        enableForceInvertColor(true);



        setUpViewAttributes(/* isLightTheme= */ true, /* isLightBackground = */ false);



        TestUtils.waitUntil("Waiting for ForceDarkType to be ready",

                () -> (mViewRootImpl.determineForceDarkType()

                        == ForceDarkType.FORCE_INVERT_COLOR_DARK));

    }



    @Test

    @EnableFlags(FLAG_FORCE_INVERT_COLOR)

    public void determineForceDarkType_notLightThemeAndIsLightBackground_returnsNone()

            throws Exception {

    public void determineForceDarkType_notLightTheme_returnsNone() throws Exception {

        // Set up configurations for force invert color

        waitForSystemNightModeActivated(true);

        enableForceInvertColor(true);



        setUpViewAttributes(/* isLightTheme= */ false, /* isLightBackground = */ true);



        TestUtils.waitUntil("Waiting for ForceDarkType to be ready",

                () -> (mViewRootImpl.determineForceDarkType() == ForceDarkType.NONE));

    }



    @Test

    @EnableFlags(FLAG_FORCE_INVERT_COLOR)

    public void determineForceDarkType_notLightThemeAndNotLightBackground_returnsNone()

            throws Exception {

        // Set up configurations for force invert color

        waitForSystemNightModeActivated(true);

        enableForceInvertColor(true);



        setUpViewAttributes(/* isLightTheme= */ false, /* isLightBackground = */ false);

        setUpViewAttributes(/* isLightTheme= */ false);



        TestUtils.waitUntil("Waiting for ForceDarkType to be ready",

                () -> (mViewRootImpl.determineForceDarkType() == ForceDarkType.NONE));
@@ -1797,7 +1763,7 @@ public class ViewRootImplTest { 
        });

    }



    private void setUpViewAttributes(boolean isLightTheme, boolean isLightBackground) {

    private void setUpViewAttributes(boolean isLightTheme) {

        ShellIdentityUtils.invokeWithShellPermissions(() -> {

            sContext.setTheme(isLightTheme ? android.R.style.Theme_DeviceDefault_Light

                    : android.R.style.Theme_DeviceDefault);
@@ -1809,11 +1775,6 @@ public class ViewRootImplTest { 
                    TYPE_APPLICATION_OVERLAY);

            layoutParams.token = new Binder();

            view.setLayoutParams(layoutParams);

            if (isLightBackground) {

                view.setBackgroundColor(Color.WHITE);

            } else {

                view.setBackgroundColor(Color.BLACK);

            }

            mViewRootImpl.setView(view, layoutParams, /* panelParentView= */ null);

            mViewRootImpl.updateConfiguration(sContext.getDisplayNoVerify().getDisplayId());

        });