From 567b43017af6f51d67ee05397df665bf136cb177 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 27 Feb 2016 12:04:03 +0100 Subject: [PATCH] cmsdk: Add cyanogenmod.util to stubs and update API * ColorUtils was recently added here and it's suitable for general consumption. Add this to the API. Change-Id: Iff89d5714092d02070f1c6805e0e8f95debd980d --- Android.mk | 4 ++-- api/cm_current.txt | 16 ++++++++++++++++ system-api/cm_system-current.txt | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 2dfaa78..84fcdab 100644 --- a/Android.mk +++ b/Android.mk @@ -226,7 +226,7 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:= build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_OPTIONS:= \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/cmsdk_stubs_current_intermediates/src \ - -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:cyanogenmod.hardware:cyanogenmod.media:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.providers:cyanogenmod.platform:cyanogenmod.power:cyanogenmod.externalviews \ + -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:cyanogenmod.externalviews:cyanogenmod.hardware:cyanogenmod.media:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.providers:cyanogenmod.platform:cyanogenmod.power:cyanogenmod.util \ -exclude org.cyanogenmod.platform.internal \ -api $(INTERNAL_CM_PLATFORM_API_FILE) \ -removedApi $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) \ @@ -256,7 +256,7 @@ LOCAL_MODULE := cm-system-api-stubs LOCAL_DROIDDOC_OPTIONS:=\ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/cmsdk_system_stubs_current_intermediates/src \ - -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:cyanogenmod.hardware:cyanogenmod.media:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.providers:cyanogenmod.platform:cyanogenmod.power:cyanogenmod.externalviews \ + -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:cyanogenmod.externalviews:cyanogenmod.hardware:cyanogenmod.media:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.providers:cyanogenmod.platform:cyanogenmod.power:cyanogenmod.util \ -showAnnotation android.annotation.SystemApi \ -exclude org.cyanogenmod.platform.internal \ -api $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) \ diff --git a/api/cm_current.txt b/api/cm_current.txt index a121bbb..cced235 100644 --- a/api/cm_current.txt +++ b/api/cm_current.txt @@ -880,3 +880,19 @@ package cyanogenmod.providers { } +package cyanogenmod.util { + + public class ColorUtils { + ctor public ColorUtils(); + method public static double calculateDeltaE(double, double, double, double, double, double); + method public static float[] convertRGBtoLAB(int); + method public static int dropAlpha(int); + method public static int findPerceptuallyNearestColor(int, int[]); + method public static int findPerceptuallyNearestSolidColor(int); + method public static int generateAlertColorFromDrawable(android.graphics.drawable.Drawable); + method public static com.android.internal.util.cm.palette.Palette.Swatch getDominantSwatch(com.android.internal.util.cm.palette.Palette); + method public static float[] temperatureToRGB(int); + } + +} + diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt index a121bbb..cced235 100644 --- a/system-api/cm_system-current.txt +++ b/system-api/cm_system-current.txt @@ -880,3 +880,19 @@ package cyanogenmod.providers { } +package cyanogenmod.util { + + public class ColorUtils { + ctor public ColorUtils(); + method public static double calculateDeltaE(double, double, double, double, double, double); + method public static float[] convertRGBtoLAB(int); + method public static int dropAlpha(int); + method public static int findPerceptuallyNearestColor(int, int[]); + method public static int findPerceptuallyNearestSolidColor(int); + method public static int generateAlertColorFromDrawable(android.graphics.drawable.Drawable); + method public static com.android.internal.util.cm.palette.Palette.Swatch getDominantSwatch(com.android.internal.util.cm.palette.Palette); + method public static float[] temperatureToRGB(int); + } + +} +