ADHOC
/
replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

livedisplay: Connect display modes to CMHW 

REF: CRACKLING-1069
Change-Id: I5be5cabf316d9bd02ab4ffc169d458ab8d1b46d4
This commit is contained in:
Ethan Chen 2016-04-25 17:44:08 -07:00
parent e41c2924cb
commit c68b38ac3a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cm/lib/main/java/org/cyanogenmod/platform/internal/display/DisplayHardwareController.java
View File

@ -47,6 +47,7 @@ public class DisplayHardwareController extends LiveDisplayFeature {
private final boolean mUseColorAdjustment; private final boolean mUseColorAdjustment;
private final boolean mUseColorEnhancement; private final boolean mUseColorEnhancement;
private final boolean mUseCABC; private final boolean mUseCABC;
private final boolean mUseDisplayModes;
// default values // default values
private final boolean mDefaultAutoContrast; private final boolean mDefaultAutoContrast;
@ -92,6 +93,10 @@ public class DisplayHardwareController extends LiveDisplayFeature {
mUseColorAdjustment = mHardware mUseColorAdjustment = mHardware
.isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION); .isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION);
mUseDisplayModes = mHardware
.isSupported(CMHardwareManager.FEATURE_DISPLAY_MODES);
if (mUseColorAdjustment) { if (mUseColorAdjustment) {
mMaxColor = mHardware.getDisplayColorCalibrationMax(); mMaxColor = mHardware.getDisplayColorCalibrationMax();
copyColors(getColorAdjustment(), mColorAdjustment); copyColors(getColorAdjustment(), mColorAdjustment);
@ -138,7 +143,11 @@ public class DisplayHardwareController extends LiveDisplayFeature {
if (mUseColorAdjustment) { if (mUseColorAdjustment) {
caps.set(LiveDisplayManager.FEATURE_COLOR_ADJUSTMENT); caps.set(LiveDisplayManager.FEATURE_COLOR_ADJUSTMENT);
} }
return mUseAutoContrast || mUseColorEnhancement || mUseCABC || mUseColorAdjustment; if (mUseDisplayModes) {
caps.set(LiveDisplayManager.FEATURE_DISPLAY_MODES);
}
return mUseAutoContrast || mUseColorEnhancement || mUseCABC || mUseColorAdjustment ||
mUseDisplayModes;
} }
@Override @Override
@ -190,6 +199,7 @@ public class DisplayHardwareController extends LiveDisplayFeature {
pw.println(" mUseColorAdjustment=" + mUseColorAdjustment); pw.println(" mUseColorAdjustment=" + mUseColorAdjustment);
pw.println(" mUseColorEnhancement=" + mUseColorEnhancement); pw.println(" mUseColorEnhancement=" + mUseColorEnhancement);
pw.println(" mUseCABC=" + mUseCABC); pw.println(" mUseCABC=" + mUseCABC);
pw.println(" mUseDisplayModes=" + mUseDisplayModes);
pw.println(); pw.println();
pw.println(" DisplayHardwareController State:"); pw.println(" DisplayHardwareController State:");
pw.println(" mAutoContrast=" + isAutoContrastEnabled()); pw.println(" mAutoContrast=" + isAutoContrastEnabled());