Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add COLOR_MODE_AUTOMATIC" into pi-dev am: 06c0c3a933

Browse Source 
am: 58030441c0

Change-Id: Ic75d5cbb50303981b1b131bb21f1a4cacbc35312
This commit is contained in:
Chia-I Wu
2018-04-27 09:06:42 -07:00
committed by android-build-merger
parent 50af10227e 58030441c0
commit 4786eb61ac
8 changed files with 129 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
core/java/com/android/internal/app/ColorDisplayController.java
View File

@@ -82,7 +82,7 @@ public final class ColorDisplayController {
public static final int AUTO_MODE_TWILIGHT = 2;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ COLOR_MODE_NATURAL, COLOR_MODE_BOOSTED, COLOR_MODE_SATURATED })
@IntDef({ COLOR_MODE_NATURAL, COLOR_MODE_BOOSTED, COLOR_MODE_SATURATED, COLOR_MODE_AUTOMATIC })
public @interface ColorMode {}
/**
@@ -103,12 +103,12 @@ public final class ColorDisplayController {
* @see #setColorMode(int)
*/
public static final int COLOR_MODE_SATURATED = 2;
/**
* See com.android.server.display.DisplayTransformManager.
* Color mode with automatic colors.
*
* @see #setColorMode(int)
*/
private static final String PERSISTENT_PROPERTY_SATURATION = "persist.sys.sf.color_saturation";
private static final String PERSISTENT_PROPERTY_NATIVE_MODE = "persist.sys.sf.native_mode";
public static final int COLOR_MODE_AUTOMATIC = 3;
private final Context mContext;
private final int mUserId;
@@ -361,6 +361,41 @@ public final class ColorDisplayController {
Secure.NIGHT_DISPLAY_COLOR_TEMPERATURE, colorTemperature, mUserId);
}
/**
* Get the current color mode from system properties, or return -1.
*
* See com.android.server.display.DisplayTransformManager.
*/
private @ColorMode int getCurrentColorModeFromSystemProperties() {
int displayColorSetting = SystemProperties.getInt("persist.sys.sf.native_mode", 0);
if (displayColorSetting == 0) {
return "1.0".equals(SystemProperties.get("persist.sys.sf.color_saturation"))
? COLOR_MODE_NATURAL : COLOR_MODE_BOOSTED;
} else if (displayColorSetting == 1) {
return COLOR_MODE_SATURATED;
} else if (displayColorSetting == 2) {
return COLOR_MODE_AUTOMATIC;
} else {
return -1;
}
}
private boolean isColorModeAvailable(@ColorMode int colorMode) {
// SATURATED is always allowed
if (colorMode == COLOR_MODE_SATURATED) {
return true;
}
final int[] availableColorModes = mContext.getResources().getIntArray(
R.array.config_availableColorModes);
for (int mode : availableColorModes) {
if (mode == colorMode) {
return true;
}
}
return false;
}
/**
* Get the current color mode.
*/
@@ -369,17 +404,27 @@ public final class ColorDisplayController {
return COLOR_MODE_SATURATED;
}
final int colorMode = System.getIntForUser(mContext.getContentResolver(),
int colorMode = System.getIntForUser(mContext.getContentResolver(),
System.DISPLAY_COLOR_MODE, -1, mUserId);
if (colorMode < COLOR_MODE_NATURAL || colorMode > COLOR_MODE_SATURATED) {
if (colorMode == -1) {
// There still might be a legacy system property controlling color mode that we need to
// respect.
if ("1".equals(SystemProperties.get(PERSISTENT_PROPERTY_NATIVE_MODE))) {
return COLOR_MODE_SATURATED;
}
return "1.0".equals(SystemProperties.get(PERSISTENT_PROPERTY_SATURATION))
? COLOR_MODE_NATURAL : COLOR_MODE_BOOSTED;
colorMode = getCurrentColorModeFromSystemProperties();
}
// This happens when a color mode is no longer available (e.g., after system update or B&R)
// or the device does not support any color mode.
if (!isColorModeAvailable(colorMode)) {
if (colorMode == COLOR_MODE_BOOSTED && isColorModeAvailable(COLOR_MODE_NATURAL)) {
colorMode = COLOR_MODE_NATURAL;
} else if (colorMode == COLOR_MODE_SATURATED
&& isColorModeAvailable(COLOR_MODE_AUTOMATIC)) {
colorMode = COLOR_MODE_AUTOMATIC;
} else {
colorMode = COLOR_MODE_SATURATED;
}
}
return colorMode;
}
@@ -389,7 +434,7 @@ public final class ColorDisplayController {
* @param colorMode the color mode
*/
public void setColorMode(@ColorMode int colorMode) {
if (colorMode < COLOR_MODE_NATURAL || colorMode > COLOR_MODE_SATURATED) {
if (!isColorModeAvailable(colorMode)) {
throw new IllegalArgumentException("Invalid colorMode: " + colorMode);
}
System.putIntForUser(mContext.getContentResolver(), System.DISPLAY_COLOR_MODE, colorMode,