Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44369ba0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move datetime package to sdk 26"

parents 8941e443 5e98d62c

tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.shadows.ShadowApplication;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class AutoTimeFormatPreferenceControllerTest {



    @Mock(answer = RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.verify;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class AutoTimePreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows = ShadowConnectivityManager.class)

public class AutoTimeZonePreferenceControllerTest {

tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DatePreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class TimeChangeListenerMixinTest {



    @Mock