PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move assist package to sdk 26"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-27 19:50:34 +00:00
committed by Android (Google) Code Review
parent d7054033cb 32c3f96c23
commit 0ab7616cea
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class AssistContextPreferenceControllerTest {
@Mock @Mock

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

@@ -51,7 +51,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class AssistFlashScreenPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)

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

@@ -29,7 +29,7 @@ import org.robolectric.annotation.Config;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class AssistSettingObserverTest {
private AssistSettingObserver mObserver; private AssistSettingObserver mObserver;

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

@@ -40,7 +40,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class DefaultAssistPickerTest {
private static ComponentName sTestAssist; private static ComponentName sTestAssist;

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

@@ -56,7 +56,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class DefaultAssistPreferenceControllerTest {
private static final String TEST_KEY = "test_pref_key"; private static final String TEST_KEY = "test_pref_key";

2
tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
View File

@@ -29,7 +29,7 @@ import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class ManageAssistTest { public class ManageAssistTest {
private ManageAssist mSettings; private ManageAssist mSettings;