summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2017-07-19 18:48:15 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-19 18:48:15 +0000
commit85fa07b8312262eddbe795ca00ebd451dab7b8d3 (patch)
tree330058dd48d6378fa50e0954d960bcd6a99851d2
parent19ad4c2055c001293a6d57450855ee4192feee40 (diff)
parent4dfb200d1b13d52da53b9849e813550af8778b4f (diff)
Merge "Default gradient should be the dark version" into oc-dr1-dev
am: 4dfb200d1b Change-Id: I72a0674c9a180f65536553e30f80317276073365
-rw-r--r--core/java/com/android/internal/colorextraction/ColorExtractor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/colorextraction/ColorExtractor.java b/core/java/com/android/internal/colorextraction/ColorExtractor.java
index 2648604291d9..68cf5cd74431 100644
--- a/core/java/com/android/internal/colorextraction/ColorExtractor.java
+++ b/core/java/com/android/internal/colorextraction/ColorExtractor.java
@@ -97,14 +97,14 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener
}
/**
- * Retrieve TYPE_NORMAL gradient colors considering wallpaper visibility.
+ * Retrieve gradient colors for a specific wallpaper.
*
* @param which FLAG_LOCK or FLAG_SYSTEM
* @return colors
*/
@NonNull
public GradientColors getColors(int which) {
- return getColors(which, TYPE_NORMAL);
+ return getColors(which, TYPE_DARK);
}
/**