Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable color threshold editing via SystemProperties" into tm-qpr-dev am: 79b8b96746

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

Change-Id: I1b4227698b1446a34ff24330e33b62679d3124f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florence Yang
2023-01-31 22:32:16 +00:00
committed by Automerger Merge Worker
parent 08c7577215 79b8b96746
commit 1dc20eb066
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/WallpaperColors.java
View File

@@ -27,6 +27,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.SystemProperties;
import android.util.Log; import android.util.Log;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.Size; import android.util.Size;
@@ -101,11 +102,13 @@ public final class WallpaperColors implements Parcelable {
// Decides when dark theme is optimal for this wallpaper // Decides when dark theme is optimal for this wallpaper
private static final float DARK_THEME_MEAN_LUMINANCE = 0.3f; private static final float DARK_THEME_MEAN_LUMINANCE = 0.3f;
// Minimum mean luminosity that an image needs to have to support dark text // Minimum mean luminosity that an image needs to have to support dark text
private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = 0.7f; private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = SystemProperties.getInt(
"persist.wallpapercolors.threshold", 70) / 100f;
// We also check if the image has dark pixels in it, // We also check if the image has dark pixels in it,
// to avoid bright images with some dark spots. // to avoid bright images with some dark spots.
private static final float DARK_PIXEL_CONTRAST = 5.5f; private static final float DARK_PIXEL_CONTRAST = 5.5f;
private static final float MAX_DARK_AREA = 0.05f; private static final float MAX_DARK_AREA = SystemProperties.getInt(
"persist.wallpapercolors.max_dark_area", 5) / 100f;
private final List<Color> mMainColors; private final List<Color> mMainColors;
private final Map<Integer, Integer> mAllColors; private final Map<Integer, Integer> mAllColors;