rename v2 controllers

- Remove v2 postfix on controllers now that v1 dev options have been
 removed

Bug: 34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
This commit is contained in:
jeffreyhuang
2017-11-22 16:44:51 -08:00
parent eeffbf6225
commit e89dc36149
20 changed files with 123 additions and 127 deletions

View File

@@ -223,10 +223,10 @@ public class DevelopmentSettingsDashboardFragmentTest {
@Test
public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
final LogPersistPreferenceControllerV2 controller = mock(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = mock(
LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogConfirmed();
verify(controller).onDisableLogPersistDialogConfirmed();
@@ -234,10 +234,10 @@ public class DevelopmentSettingsDashboardFragmentTest {
@Test
public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
final LogPersistPreferenceControllerV2 controller = mock(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = mock(
LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogRejected();
verify(controller).onDisableLogPersistDialogRejected();