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

DO NOT MERGE - Move color mode to DisplayTransformManager

Browse Source 
am: cd2b7aea5f

Change-Id: I1ebad738c64493b1929b2eb299b41c1bb365f6fe
This commit is contained in:
Christine Franks
2017-10-25 20:23:06 +00:00
committed by android-build-merger
parent c892a3cfc9 cd2b7aea5f
commit 7f3176aceb
4 changed files with 44 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; package com.android.settings.display;
import android.app.ActivityManager;
import android.app.IActivityManager;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; 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.support.annotation.VisibleForTesting;
import android.util.Log;
import com.android.internal.app.NightDisplayController;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
@@ -35,20 +28,6 @@ import java.util.List;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
public class ColorModePreferenceFragment extends RadioButtonPickerFragment { 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 @VisibleForTesting
static final String KEY_COLOR_MODE_NATURAL = "color_mode_natural"; static final String KEY_COLOR_MODE_NATURAL = "color_mode_natural";
@@ -57,14 +36,12 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@VisibleForTesting @VisibleForTesting
static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated"; static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
private IBinder mSurfaceFlinger; private NightDisplayController mController;
private IActivityManager mActivityManager;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger"); mController = new NightDisplayController(context);
mActivityManager = ActivityManager.getService();
} }
@Override @Override
@@ -82,10 +59,10 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@Override @Override
protected String getDefaultKey() { protected String getDefaultKey() {
if (isNativeModeEnabled()) { if (mController.getColorMode() == NightDisplayController.COLOR_MODE_SATURATED) {
return KEY_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_BOOSTED;
} }
return KEY_COLOR_MODE_NATURAL; return KEY_COLOR_MODE_NATURAL;
@@ -95,89 +72,23 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
protected boolean setDefaultKey(String key) { protected boolean setDefaultKey(String key) {
switch (key) { switch (key) {
case KEY_COLOR_MODE_NATURAL: case KEY_COLOR_MODE_NATURAL:
applySaturation(COLOR_SATURATION_NATURAL); mController.setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
setNativeMode(false);
break; break;
case KEY_COLOR_MODE_BOOSTED: case KEY_COLOR_MODE_BOOSTED:
applySaturation(COLOR_SATURATION_BOOSTED); mController.setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
setNativeMode(false);
break; break;
case KEY_COLOR_MODE_SATURATED: case KEY_COLOR_MODE_SATURATED:
applySaturation(COLOR_SATURATION_NATURAL); mController.setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
setNativeMode(true);
break; break;
} }
updateConfiguration();
return true; return true;
} }
@VisibleForTesting
void updateConfiguration() {
try {
mActivityManager.updateConfiguration(null);
} catch (RemoteException e) {
Log.d(TAG, "Could not update configuration", e);
}
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS; 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 @VisibleForTesting
static class ColorModeCandidateInfo extends CandidateInfo { static class ColorModeCandidateInfo extends CandidateInfo {
private final CharSequence mLabel; private final CharSequence mLabel;
@@ -204,4 +115,5 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
return mKey; return mKey;
} }
} }
} }

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

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

17
tests/robotests/src/com/android/internal/app/NightDisplayController.java
View File

@@ -21,7 +21,22 @@ package com.android.internal.app;
*/ */
public class NightDisplayController { public class NightDisplayController {
public interface Callback { public static final int AUTO_MODE_CUSTOM = 1;
public static final int COLOR_MODE_NATURAL = 0;
public static final int AUTO_MODE_TWILIGHT = 2;
public static final int COLOR_MODE_BOOSTED = 1;
public static final int COLOR_MODE_SATURATED = 2;
private int mColorMode;
public void setColorMode(int colorMode) {
mColorMode = colorMode;
}
public int getColorMode() {
return mColorMode;
}
public interface Callback {
} }
} }

76
tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
View File

@@ -16,18 +16,11 @@
package com.android.settings.display; package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.IActivityManager; import com.android.internal.app.NightDisplayController;
import android.content.res.Configuration;
import android.os.IBinder;
import android.os.RemoteException;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -37,6 +30,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@@ -47,24 +41,19 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ColorModePreferenceFragmentTest { public class ColorModePreferenceFragmentTest {
@Mock
private IBinder mSurfaceFlinger;
@Mock
private IActivityManager mActivityManager;
private ColorModePreferenceFragment mFragment; private ColorModePreferenceFragment mFragment;
@Mock
private NightDisplayController mController;
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
SettingsShadowSystemProperties.clear(); SettingsShadowSystemProperties.clear();
mFragment = spy(new ColorModePreferenceFragment()); mFragment = spy(new ColorModePreferenceFragment());
doReturn(RuntimeEnvironment.application).when(mFragment).getContext(); ReflectionHelpers.setField(mFragment, "mController", mController);
doNothing().when(mFragment).updateConfiguration();
ReflectionHelpers.setField(mFragment, "mSurfaceFlinger", mSurfaceFlinger);
ReflectionHelpers.setField(mFragment, "mActivityManager", mActivityManager);
} }
@Test @Test
@@ -75,6 +64,7 @@ public class ColorModePreferenceFragmentTest {
@Test @Test
public void getCandidates() { public void getCandidates() {
when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
List<? extends RadioButtonPickerFragment.CandidateInfo> candidates = List<? extends RadioButtonPickerFragment.CandidateInfo> candidates =
mFragment.getCandidates(); mFragment.getCandidates();
@@ -90,11 +80,8 @@ public class ColorModePreferenceFragmentTest {
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void getKey_natural() { public void getKey_natural() {
SettingsShadowSystemProperties.set( Mockito.when(mController.getColorMode()).thenReturn(
ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION, NightDisplayController.COLOR_MODE_NATURAL);
Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL));
SettingsShadowSystemProperties.set(
ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "0");
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
@@ -103,11 +90,8 @@ public class ColorModePreferenceFragmentTest {
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void getKey_boosted() { public void getKey_boosted() {
SettingsShadowSystemProperties.set( Mockito.when(mController.getColorMode()).thenReturn(
ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION, NightDisplayController.COLOR_MODE_BOOSTED);
Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_BOOSTED));
SettingsShadowSystemProperties.set(
ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "0");
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
@@ -116,55 +100,31 @@ public class ColorModePreferenceFragmentTest {
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void getKey_saturated() { public void getKey_saturated() {
SettingsShadowSystemProperties.set( Mockito.when(mController.getColorMode()).thenReturn(
ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "1"); NightDisplayController.COLOR_MODE_SATURATED);
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
} }
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void setKey_natural() { public void setKey_natural() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
String saturation = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION);
assertThat(saturation)
.isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL));
String nativeMode = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE);
assertThat(nativeMode).isEqualTo("0");
} }
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void setKey_boosted() { public void setKey_boosted() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
String saturation = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION);
assertThat(saturation)
.isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_BOOSTED));
String nativeMode = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE);
assertThat(nativeMode).isEqualTo("0");
} }
@Config(shadows = {SettingsShadowSystemProperties.class}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void setKey_saturated() { public void setKey_saturated() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
String saturation = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION);
assertThat(saturation)
.isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL));
String nativeMode = SettingsShadowSystemProperties
.get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE);
assertThat(nativeMode).isEqualTo("1");
} }
} }