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

Commit fd0e057c authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Move fingerprint package to sdk 26 

Test: make RunSettingsRoboTests -j40
Change-Id: Ieefdc9d10b8c3b68757c6a89990f380599e14e9b
parent 80e1b060

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = Config.NEWEST_SDK,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                ShadowUtils.class,

                ShadowVibrator.class

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import org.robolectric.shadows.ShadowActivity.IntentForResult; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResources.SettingsShadowTheme.class,

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.mockito.MockitoAnnotations; 
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)

public class FingerprintEnrollSuggestionActivityTest {



    @Mock

tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy; 
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 FingerprintLocationAnimationVideoViewTest {



    private Context mContext;

tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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 FingerprintPreferenceTest {



    @Mock