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

Remove duplicates between battery and display settings

Browse Source 
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
This commit is contained in:
Matthew Fritze
2017-04-11 13:22:40 -07:00
parent 7cfaa8ceb2
commit c6f2638009
14 changed files with 280 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
View File

@@ -43,12 +43,13 @@ public class AutoBrightnessPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private AutoBrightnessPreferenceController mController;
private final String PREFERENCE_KEY = "auto_brightness";
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new AutoBrightnessPreferenceController(mContext);
mController = new AutoBrightnessPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
@@ -72,7 +73,7 @@ public class AutoBrightnessPreferenceControllerTest {
@Test
public void testPreferenceController_ProperResultPayloadType() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new AutoBrightnessPreferenceController(context);
mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@@ -80,7 +81,7 @@ public class AutoBrightnessPreferenceControllerTest {
@Test
public void testPreferenceController_CorrectPayload() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new AutoBrightnessPreferenceController(context);
mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("screen_brightness_mode");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SYSTEM);