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

Commit 27d28381 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge changes from topics "color_area_calculation_force_invert_enabled",... 

Merge changes from topics "color_area_calculation_force_invert_enabled", "force_invert_with_benchmark_check" into main

* changes:
  Apply color area calculation when ForceInvert is enabled only
  Revert "Revert "feat(force invert): also count areas of draw cal..."
  Revert "Revert "feat(force invert): force invert the entire app ..."
  Revert "Revert "feat(force invert): detect the polarity of an ap..."
parents 45bb23b3 7a40195b

core/java/android/view/ViewRootImpl.java

+5 −16
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_ 
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;

import static com.android.window.flags.Flags.enableWindowContextResourcesUpdateOnConfigChange;

import static com.android.window.flags.Flags.fixViewRootCallTrace;

import static com.android.window.flags.Flags.predictiveBackSwipeEdgeNoneApi;

import static com.android.window.flags.Flags.reduceChangedExclusionRectsMsgs;

import static com.android.window.flags.Flags.setScPropertiesInClient;

import static com.android.window.flags.Flags.fixViewRootCallTrace;















import android.Manifest;















import android.accessibilityservice.AccessibilityService;










@@ -187,7 +187,6 @@ import android.graphics.Rect;













import android.graphics.RectF;















import android.graphics.Region;















import android.graphics.RenderNode;













import android.graphics.drawable.ColorDrawable;















import android.graphics.drawable.Drawable;















import android.graphics.drawable.GradientDrawable;















import android.hardware.SyncFence;










@@ -289,7 +288,6 @@ import com.android.internal.os.SomeArgs;













import com.android.internal.policy.DecorView;















import com.android.internal.policy.PhoneFallbackEventHandler;















import com.android.internal.protolog.ProtoLog;













import com.android.internal.util.ContrastColorUtil;















import com.android.internal.util.FastPrintWriter;















import com.android.internal.view.BaseSurfaceHolder;















import com.android.internal.view.RootViewSurfaceTaker;










@@ -2065,21 +2063,12 @@ public final class ViewRootImpl implements ViewParent,













                // preference for dark mode in configuration.uiMode. Instead, we assume that both















                // force invert and the system's dark theme are enabled.















                if (shouldApplyForceInvertDark()) {













                    // TODO: b/368725782 - Use hwui color area detection instead of / in













                    //  addition to these heuristics.













                    // We will use HWUI color area detection to determine if it should actually be













                    // inverted. Checking light theme simply gives the developer a way to "opt-out"













                    // of force invert.















                    final boolean isLightTheme =















                            a.getBoolean(R.styleable.Theme_isLightTheme, false);













                    final boolean isBackgroundColorLight;













                    if (mView != null && mView.getBackground()













                            instanceof ColorDrawable colorDrawable) {













                        isBackgroundColorLight =













                                !ContrastColorUtil.isColorDarkLab(colorDrawable.getColor());













                    } else {













                        // Treat unknown as light, so that only isLightTheme is used to determine













                        // force dark treatment.













                        isBackgroundColorLight = true;













                    }













                    if (isLightTheme && isBackgroundColorLight) {













                    if (isLightTheme) {















                        return ForceDarkType.FORCE_INVERT_COLOR_DARK;















                    } else {















                        return ForceDarkType.NONE;

































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



+4
−2




























Original line number
Diff line number
Diff line








@@ -1494,7 +1494,8 @@ public class ViewRootImplTest {





























    @Test















    @EnableFlags(FLAG_FORCE_INVERT_COLOR)













    public void determineForceDarkType_isLightThemeAndNotLightBackground_returnsNone()













    public void













            determineForceDarkType_isLightThemeAndNotLightBackground_returnsForceInvertColorDark()















            throws Exception {















        // Set up configurations for force invert color















        waitForSystemNightModeActivated(true);









@@ -1503,7 +1504,8 @@ public class ViewRootImplTest {













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































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













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













                () -> (mViewRootImpl.determineForceDarkType()













                        == ForceDarkType.FORCE_INVERT_COLOR_DARK));















    }































    @Test

































libs/hwui/Android.bp



+1
−0




























Original line number
Diff line number
Diff line








@@ -616,6 +616,7 @@ cc_defaults {













        "Animator.cpp",















        "AnimatorManager.cpp",















        "CanvasTransform.cpp",













        "ColorArea.cpp",















        "DamageAccumulator.cpp",















        "DeviceInfo.cpp",















        "FrameInfo.cpp",

































libs/hwui/CanvasTransform.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -127,7 +127,7 @@ static BitmapPalette paletteForColorHSV(SkColor color) {













    return hsv[2] >= .5f ? BitmapPalette::Light : BitmapPalette::Dark;















}





























static BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette) {













BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette) {















    if (palette == BitmapPalette::Unknown || !paint || !paint->getColorFilter()) {















        return palette;















    }

































libs/hwui/CanvasTransform.h



+3
−0




























Original line number
Diff line number
Diff line








@@ -48,4 +48,7 @@ bool transformPaint(ColorTransform transform, SkPaint* paint, BitmapPalette pale













SkColor transformColor(ColorTransform transform, SkColor color);















SkColor transformColorInverse(ColorTransform transform, SkColor color);





























/** Returns a palette corrected in case it is tinted by the given paint's filter */













BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette);





























}  // namespace android::uirenderer