From a291d19e47a8a784fda56566754364d2107baed4 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 7 Jun 2018 13:59:42 -0700 Subject: More conservative dark text calculation Refactored WallpaperColors to use constrast ratio instead of luminance for detecting dark pixels. Also using a contrast more conservative than what GAR requires while decreasing the dark area threshold. Change-Id: I67b799be4b7ccd50bb3e63c6179d513b9b76446b Fixes: 76435920 Test: manually set various wallpapers Test: use new debug flag to verify which pixel is actually dark --- core/java/android/widget/RemoteViews.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android/widget/RemoteViews.java') diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 4865dab6056a..22c840b3bf7e 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -68,7 +68,7 @@ import android.view.ViewStub; import android.widget.AdapterView.OnItemClickListener; import com.android.internal.R; -import com.android.internal.util.NotificationColorUtil; +import com.android.internal.util.ContrastColorUtil; import com.android.internal.util.Preconditions; import java.lang.annotation.ElementType; @@ -2155,7 +2155,7 @@ public class RemoteViews implements Parcelable, Filter { View v = viewsToProcess.pop(); if (v instanceof TextView) { TextView textView = (TextView) v; - textView.setText(NotificationColorUtil.clearColorSpans(textView.getText())); + textView.setText(ContrastColorUtil.clearColorSpans(textView.getText())); textView.setTextColor(textColor); } if (v instanceof ViewGroup) { -- cgit v1.2.3