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

Merge "Respect legacy color mode settings" into oc-mr1-dev

Browse Source
This commit is contained in:
Christine Franks
2017-11-02 01:13:21 +00:00
committed by Android (Google) Code Review
parent c2496f917c 8ab97c1e41
commit 58a10a7b12
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/app/NightDisplayController.java
View File

@@ -25,6 +25,7 @@ import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemProperties;
import android.provider.Settings.Secure;
import android.provider.Settings.System;
import android.util.Slog;
@@ -100,6 +101,12 @@ public final class NightDisplayController {
*/
public static final int COLOR_MODE_SATURATED = 2;
/**
* See com.android.server.display.DisplayTransformManager.
*/
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";
private final Context mContext;
private final int mUserId;
@@ -334,9 +341,15 @@ public final class NightDisplayController {
*/
public int getColorMode() {
final int colorMode = System.getIntForUser(mContext.getContentResolver(),
System.DISPLAY_COLOR_MODE, COLOR_MODE_BOOSTED, mUserId);
System.DISPLAY_COLOR_MODE, -1, mUserId);
if (colorMode < COLOR_MODE_NATURAL || colorMode > COLOR_MODE_SATURATED) {
return COLOR_MODE_BOOSTED;
// 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;
}
return colorMode;
}