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

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

Merge "Move accessibility package to sdk 26"

parents 30154ada cafc84d2

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.List; 
import static com.google.common.truth.Truth.assertThat;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AccessibilitySettingsTest {



    @Test

tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,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)

public class ShortcutServicePickerFragmentTest {



    private static final String TEST_SERVICE_KEY_1 = "abc/123";

tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.util.FragmentTestUtil;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResources.SettingsShadowTheme.class,