OSDN Git Service

move gestures package to sdk 26
authorjeffreyhuang <jeffreyhuang@google.com>
Thu, 30 Nov 2017 19:50:39 +0000 (11:50 -0800)
committerjeffreyhuang <jeffreyhuang@google.com>
Thu, 30 Nov 2017 20:16:24 +0000 (12:16 -0800)
Test: make RunSettingsRoboTests -j40
Change-Id: I7925482b43e178a01e2a21176919306a1284007d

tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java

index 7633ce9..40c4af3 100644 (file)
@@ -45,7 +45,7 @@ import org.robolectric.annotation.Config;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = ShadowSecureSettings.class
 )
 public class AssistGestureSettingsPreferenceControllerTest {
index 041b7e0..b2bd27e 100644 (file)
@@ -41,7 +41,7 @@ import org.robolectric.shadows.ShadowApplication;
 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 AssistGestureSettingsTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
index 1f5ca20..12ecc90 100644 (file)
@@ -48,7 +48,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         SettingsShadowResources.class
 })
 public class DoubleTapPowerPreferenceControllerTest {
index b9635a7..e322b07 100644 (file)
@@ -32,7 +32,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 DoubleTapPowerSettingsTest {
 
     private DoubleTapPowerSettings mSettings;
index 3d56d71..e29bf79 100644 (file)
@@ -32,7 +32,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 DoubleTapScreenSettingsTest {
 
     private DoubleTapScreenSettings mSettings;
index 236896a..081ff79 100644 (file)
@@ -32,7 +32,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 DoubleTwistGestureSettingsTest {
 
     private DoubleTwistGestureSettings mSettings;
index a7516fc..b48889f 100644 (file)
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         SettingsShadowResources.class
 })
 public class DoubleTwistPreferenceControllerTest {
index b12b373..dcc06af 100644 (file)
@@ -48,7 +48,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 GesturesSettingsPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
index 2c4a1c4..05c88ba 100644 (file)
@@ -32,7 +32,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 PickupGestureSettingsTest {
 
     private PickupGestureSettings mSettings;
index f3cc2ca..f535a99 100644 (file)
@@ -41,7 +41,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 SwipeToNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
index 0b329d3..7e3b90e 100644 (file)
@@ -37,7 +37,7 @@ import org.robolectric.shadows.ShadowApplication;
 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 SwipeToNotificationSettingsTest {
 
     @Mock