PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move color mode to DisplayTransformManager"

Browse Source
This commit is contained in:
Christine Franks
2017-10-27 16:10:22 +00:00
committed by Android (Google) Code Review
parent 244f4c5686 dd811e246b
commit 34f7b5af59
4 changed files with 46 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/com/android/settings/display/ColorModePreferenceFragment.java
View File

@@ -13,18 +13,11 @@
*/
package com.android.settings.display;
import android.app.ActivityManager;
import android.app.IActivityManager;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
import com.android.internal.app.NightDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -35,20 +28,6 @@ import java.util.List;
@SuppressWarnings("WeakerAccess")
public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
private static final String TAG = "ColorModePreferenceFragment";
@VisibleForTesting
static final float COLOR_SATURATION_NATURAL = 1.0f;
@VisibleForTesting
static final float COLOR_SATURATION_BOOSTED = 1.1f;
private static final int SURFACE_FLINGER_TRANSACTION_SATURATION = 1022;
private static final int SURFACE_FLINGER_TRANSACTION_NATIVE_MODE = 1023;
@VisibleForTesting
static final String PERSISTENT_PROPERTY_SATURATION = "persist.sys.sf.color_saturation";
@VisibleForTesting
static final String PERSISTENT_PROPERTY_NATIVE_MODE = "persist.sys.sf.native_mode";
@VisibleForTesting
static final String KEY_COLOR_MODE_NATURAL = "color_mode_natural";
@@ -57,14 +36,12 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@VisibleForTesting
static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
private IBinder mSurfaceFlinger;
private IActivityManager mActivityManager;
private NightDisplayController mController;
@Override
public void onAttach(Context context) {
super.onAttach(context);
mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
mActivityManager = ActivityManager.getService();
mController = new NightDisplayController(context);
}
@Override
@@ -82,10 +59,10 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@Override
protected String getDefaultKey() {
if (isNativeModeEnabled()) {
if (mController.getColorMode() == NightDisplayController.COLOR_MODE_SATURATED) {
return KEY_COLOR_MODE_SATURATED;
}
if (getSaturationValue() > COLOR_SATURATION_NATURAL) {
if (mController.getColorMode() == NightDisplayController.COLOR_MODE_BOOSTED) {
return KEY_COLOR_MODE_BOOSTED;
}
return KEY_COLOR_MODE_NATURAL;
@@ -95,89 +72,23 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
protected boolean setDefaultKey(String key) {
switch (key) {
case KEY_COLOR_MODE_NATURAL:
applySaturation(COLOR_SATURATION_NATURAL);
setNativeMode(false);
mController.setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
break;
case KEY_COLOR_MODE_BOOSTED:
applySaturation(COLOR_SATURATION_BOOSTED);
setNativeMode(false);
mController.setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
break;
case KEY_COLOR_MODE_SATURATED:
applySaturation(COLOR_SATURATION_NATURAL);
setNativeMode(true);
mController.setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
break;
}
updateConfiguration();
return true;
}
@VisibleForTesting
void updateConfiguration() {
try {
mActivityManager.updateConfiguration(null);
} catch (RemoteException e) {
Log.d(TAG, "Could not update configuration", e);
}
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS;
}
/**
* Propagates the provided saturation to the SurfaceFlinger.
*/
private void applySaturation(float saturation) {
SystemProperties.set(PERSISTENT_PROPERTY_SATURATION, Float.toString(saturation));
if (mSurfaceFlinger != null) {
final Parcel data = Parcel.obtain();
data.writeInterfaceToken("android.ui.ISurfaceComposer");
data.writeFloat(saturation);
try {
mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_SATURATION, data, null, 0);
} catch (RemoteException ex) {
Log.e(TAG, "Failed to set saturation", ex);
} finally {
data.recycle();
}
}
}
private static float getSaturationValue() {
try {
return Float.parseFloat(SystemProperties.get(
PERSISTENT_PROPERTY_SATURATION, Float.toString(COLOR_SATURATION_NATURAL)));
} catch (NumberFormatException e) {
return COLOR_SATURATION_NATURAL;
}
}
/**
* Toggles native mode on/off in SurfaceFlinger.
*/
private void setNativeMode(boolean enabled) {
SystemProperties.set(PERSISTENT_PROPERTY_NATIVE_MODE, enabled ? "1" : "0");
if (mSurfaceFlinger != null) {
final Parcel data = Parcel.obtain();
data.writeInterfaceToken("android.ui.ISurfaceComposer");
data.writeInt(enabled ? 1 : 0);
try {
mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_NATIVE_MODE, data, null, 0);
} catch (RemoteException ex) {
Log.e(TAG, "Failed to set native mode", ex);
} finally {
data.recycle();
}
}
}
private static boolean isNativeModeEnabled() {
return SystemProperties.getBoolean(PERSISTENT_PROPERTY_NATIVE_MODE, false);
}
@VisibleForTesting
static class ColorModeCandidateInfo extends CandidateInfo {
private final CharSequence mLabel;
@@ -204,4 +115,5 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
return mKey;
}
}
}

1
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -120,6 +120,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
onCustomStartTimeChanged(mController.getCustomStartTime());
onCustomEndTimeChanged(mController.getCustomEndTime());
onColorTemperatureChanged(mController.getColorTemperature());
onDisplayColorModeChanged(mController.getColorMode());
}
@Override