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

Move color mode to DisplayTransformManager

Browse Source 
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100

Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
This commit is contained in:
Christine Franks
2017-10-25 08:55:52 -07:00
parent a12b3d318d
commit 3d1d4a6628
4 changed files with 44 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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