cmsdk/livedisplay: Add support for picture adjustment

 * Allows adjustment of hue, saturation, intensity, and contrast.

Change-Id: Icf8ff6200a07b68e09dcd7f140a82e57b53944f7

1 files changed, 37 insertions, 1 deletions

diff --git a/api/cm_current.txt b/api/cm_current.txt
index 73de8ed..a93f52f 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -455,6 +455,7 @@ package cyanogenmod.hardware {
     method public android.util.Range<java.lang.Integer> getColorBalanceRange();
     method public cyanogenmod.hardware.DisplayMode getCurrentDisplayMode();
     method public cyanogenmod.hardware.DisplayMode getDefaultDisplayMode();
+    method public cyanogenmod.hardware.HSIC getDefaultPictureAdjustment();
     method public int[] getDisplayColorCalibration();
     method public int getDisplayColorCalibrationDefault();
     method public int getDisplayColorCalibrationMax();
@@ -468,6 +469,8 @@ package cyanogenmod.hardware {
     method public long getLtoDownloadInterval();
     method public java.lang.String getLtoSource();
     method public deprecated int getNumGammaControls();
+    method public cyanogenmod.hardware.HSIC getPictureAdjustment();
+    method public java.util.List<android.util.Range<java.lang.Float>> getPictureAdjustmentRanges();
     method public java.lang.String getSerialNumber();
     method public int getSupportedFeatures();
     method public int getThermalState();
@@ -489,6 +492,7 @@ package cyanogenmod.hardware {
     method public boolean setDisplayColorCalibration(int[]);
     method public deprecated boolean setDisplayGammaCalibration(int, int[]);
     method public boolean setDisplayMode(cyanogenmod.hardware.DisplayMode, boolean);
+    method public boolean setPictureAdjustment(cyanogenmod.hardware.HSIC);
     method public boolean setVibratorIntensity(int);
     method public boolean unRegisterThermalListener(cyanogenmod.hardware.ThermalListenerCallback);
     method public boolean writePersistentBytes(java.lang.String, byte[]);
@@ -505,6 +509,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_KEY_DISABLE = 32; // 0x20
     field public static final int FEATURE_LONG_TERM_ORBITS = 64; // 0x40
     field public static final int FEATURE_PERSISTENT_STORAGE = 16384; // 0x4000
+    field public static final int FEATURE_PICTURE_ADJUSTMENT = 262144; // 0x40000
     field public static final int FEATURE_SERIAL_NUMBER = 128; // 0x80
     field public static final int FEATURE_SUNLIGHT_ENHANCEMENT = 256; // 0x100
     field public static final int FEATURE_TAP_TO_WAKE = 512; // 0x200
@@ -522,6 +527,22 @@ package cyanogenmod.hardware {
     field public final java.lang.String name;
   }
 
+  public class HSIC implements android.os.Parcelable {
+    ctor public HSIC(float, float, float, float, float);
+    method public int describeContents();
+    method public java.lang.String flatten();
+    method public static cyanogenmod.hardware.HSIC fromFloatArray(float[]);
+    method public float getContrast();
+    method public float getHue();
+    method public float getIntensity();
+    method public float getSaturation();
+    method public float getSaturationThreshold();
+    method public float[] toFloatArray();
+    method public int[] toRGB();
+    method public static cyanogenmod.hardware.HSIC unflattenFrom(java.lang.String) throws java.lang.NumberFormatException;
+    method public void writeToParcel(android.os.Parcel, int);
+  }
+
   public abstract interface IThermalListenerCallback implements android.os.IInterface {
     method public abstract void onThermalChanged(int) throws android.os.RemoteException;
   }
@@ -534,10 +555,11 @@ package cyanogenmod.hardware {
   }
 
   public class LiveDisplayConfig implements android.os.Parcelable {
-    ctor public LiveDisplayConfig(java.util.BitSet, int, int, int, boolean, boolean, boolean, boolean, android.util.Range<java.lang.Integer>, android.util.Range<java.lang.Integer>);
+    ctor public LiveDisplayConfig(java.util.BitSet, int, int, int, boolean, boolean, boolean, boolean, android.util.Range<java.lang.Integer>, android.util.Range<java.lang.Integer>, android.util.Range<java.lang.Float>, android.util.Range<java.lang.Float>, android.util.Range<java.lang.Float>, android.util.Range<java.lang.Float>, android.util.Range<java.lang.Float>);
     method public int describeContents();
     method public android.util.Range<java.lang.Integer> getColorBalanceRange();
     method public android.util.Range<java.lang.Integer> getColorTemperatureRange();
+    method public android.util.Range<java.lang.Float> getContrastRange();
     method public boolean getDefaultAutoContrast();
     method public boolean getDefaultAutoOutdoorMode();
     method public boolean getDefaultCABC();
@@ -545,6 +567,11 @@ package cyanogenmod.hardware {
     method public int getDefaultDayTemperature();
     method public int getDefaultMode();
     method public int getDefaultNightTemperature();
+    method public android.util.Range<java.lang.Float> getHueRange();
+    method public android.util.Range<java.lang.Float> getIntensityRange();
+    method public java.util.List<android.util.Range<java.lang.Float>> getPictureAdjustmentRanges();
+    method public android.util.Range<java.lang.Float> getSaturationRange();
+    method public android.util.Range<java.lang.Float> getSaturationThresholdRange();
     method public boolean hasFeature(int);
     method public boolean hasModeSupport();
     method public boolean isAvailable();
@@ -555,9 +582,11 @@ package cyanogenmod.hardware {
     method public float[] getColorAdjustment();
     method public cyanogenmod.hardware.LiveDisplayConfig getConfig();
     method public int getDayColorTemperature();
+    method public cyanogenmod.hardware.HSIC getDefaultPictureAdjustment();
     method public static synchronized cyanogenmod.hardware.LiveDisplayManager getInstance(android.content.Context);
     method public int getMode();
     method public int getNightColorTemperature();
+    method public cyanogenmod.hardware.HSIC getPictureAdjustment();
     method public boolean isAutoContrastEnabled();
     method public boolean isAutomaticOutdoorModeEnabled();
     method public boolean isCABCEnabled();
@@ -570,6 +599,11 @@ package cyanogenmod.hardware {
     method public boolean setDayColorTemperature(int);
     method public boolean setMode(int);
     method public boolean setNightColorTemperature(int);
+    method public boolean setPictureAdjustment(cyanogenmod.hardware.HSIC);
+    field public static final int ADJUSTMENT_CONTRAST = 3; // 0x3
+    field public static final int ADJUSTMENT_HUE = 0; // 0x0
+    field public static final int ADJUSTMENT_INTENSITY = 2; // 0x2
+    field public static final int ADJUSTMENT_SATURATION = 1; // 0x1
     field public static final int FEATURE_AUTO_CONTRAST = 11; // 0xb
     field public static final int FEATURE_CABC = 10; // 0xa
     field public static final int FEATURE_COLOR_ADJUSTMENT = 13; // 0xd
@@ -577,6 +611,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_COLOR_ENHANCEMENT = 12; // 0xc
     field public static final int FEATURE_DISPLAY_MODES = 15; // 0xf
     field public static final int FEATURE_MANAGED_OUTDOOR_MODE = 14; // 0xe
+    field public static final int FEATURE_PICTURE_ADJUSTMENT = 17; // 0x11
     field public static final int MODE_AUTO = 2; // 0x2
     field public static final int MODE_DAY = 4; // 0x4
     field public static final int MODE_NIGHT = 1; // 0x1
@@ -932,6 +967,7 @@ package cyanogenmod.providers {
     field public static final java.lang.String DISPLAY_COLOR_ADJUSTMENT = "display_color_adjustment";
     field public static final java.lang.String DISPLAY_COLOR_ENHANCE = "display_color_enhance";
     field public static final deprecated java.lang.String DISPLAY_LOW_POWER = "display_low_power";
+    field public static final java.lang.String DISPLAY_PICTURE_ADJUSTMENT = "display_picture_adjustment";
     field public static final java.lang.String DISPLAY_TEMPERATURE_DAY = "display_temperature_day";
     field public static final java.lang.String DISPLAY_TEMPERATURE_MODE = "display_temperature_mode";
     field public static final java.lang.String DISPLAY_TEMPERATURE_NIGHT = "display_temperature_night";