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

Add screen resource for Colors setting.

Browse Source 
- each preference fragment should have its own preference screen layout
in order to show the title correctly. Adding the missing data for
ColorModePreferenceFragment.

Change-Id: I172429dc957f94351456d4bc829897a578d7dbf9
Fixes: 68763217
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-11-01 12:54:29 -07:00
parent ef7eb162cf
commit 5a66ddbd6f
6 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
}