summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2021-05-07 15:53:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-07 15:53:16 +0000
commit284edfdcc60983e09bb557e38bebc4b97f8fae9d (patch)
treeca01c14ebb2fef4ddca4b081d347fe3897888067 /core/java/android
parent11986afc72c9ea3d393bfd1ec61ee0929e9897d8 (diff)
parent4d5a9f9d76cfc8b67b17f588b76b285efaeef872 (diff)
Merge "Allow I/O wallpaper to use dark text mode." into sc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/WallpaperColors.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
index d640a6f49670..be62deb7696d 100644
--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
@@ -95,12 +95,12 @@ public final class WallpaperColors implements Parcelable {
private static final float MIN_COLOR_OCCURRENCE = 0.05f;
// Decides when dark theme is optimal for this wallpaper
- private static final float DARK_THEME_MEAN_LUMINANCE = 0.25f;
+ private static final float DARK_THEME_MEAN_LUMINANCE = 0.3f;
// Minimum mean luminosity that an image needs to have to support dark text
- private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = 0.75f;
+ private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = 0.7f;
// We also check if the image has dark pixels in it,
// to avoid bright images with some dark spots.
- private static final float DARK_PIXEL_CONTRAST = 6f;
+ private static final float DARK_PIXEL_CONTRAST = 5.5f;
private static final float MAX_DARK_AREA = 0.025f;
private final List<Color> mMainColors;