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

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

Merge "Move assist package to sdk 26"

parents d7054033 32c3f96c

tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AssistContextPreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AssistFlashScreenPreferenceControllerTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import org.robolectric.annotation.Config; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AssistSettingObserverTest {



    private AssistSettingObserver mObserver;

tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.spy;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class DefaultAssistPickerTest {



    private static ComponentName sTestAssist;

tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class DefaultAssistPreferenceControllerTest {



    private static final String TEST_KEY = "test_pref_key";