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

Merge "Add screen resource for Colors setting."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-02 18:52:25 +00:00
committed by Android (Google) Code Review
parent 8277e3ceea 5a66ddbd6f
commit 5f167f8c9d
6 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
View File

@@ -114,6 +114,11 @@ public class DefaultAppPickerFragmentTest {
return 0;
}
@Override
protected int getPreferenceScreenResId() {
return 0;
}
@Override
protected List<DefaultAppInfo> getCandidates() {
return new ArrayList<>();

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

@@ -16,11 +16,18 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.Bundle;
import com.android.internal.app.NightDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -111,20 +118,31 @@ public class ColorModePreferenceFragmentTest {
@Test
public void setKey_natural() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
}
@Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void setKey_boosted() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
}
@Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void setKey_saturated() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
}
@Test
public void onCreatePreferences_useNewTitle_shouldAddColorModePreferences() {
doNothing().when(mFragment).addPreferencesFromResource(anyInt());
doNothing().when(mFragment).updateCandidates();
mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
verify(mFragment).addPreferencesFromResource(R.xml.color_mode_settings);
}
}

5
tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
View File

@@ -113,6 +113,11 @@ public class RadioButtonPickerFragmentTest {
return 0;
}
@Override
protected int getPreferenceScreenResId() {
return 0;
}
@Override
protected List<DefaultAppInfo> getCandidates() {
return new ArrayList<>();