aboutsummaryrefslogtreecommitdiff
path: root/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
diff options
context:
space:
mode:
Diffstat (limited to 'shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java')
-rw-r--r--shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
index 78526fade..848502e60 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
import static android.os.Build.VERSION_CODES.KITKAT;
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
import static android.os.Build.VERSION_CODES.N;
@@ -793,7 +792,7 @@ public class ShadowView {
}
}
- @Implementation(minSdk = KITKAT)
+ @Implementation
protected boolean isAttachedToWindow() {
return getAttachInfo() != null;
}
@@ -954,7 +953,7 @@ public class ShadowView {
reflector(_View_.class, realView).onDetachedFromWindow();
}
- @Implementation(minSdk = JELLY_BEAN_MR2)
+ @Implementation
protected WindowId getWindowId() {
return WindowIdHelper.getWindowId(this);
}
@@ -1092,6 +1091,7 @@ public class ShadowView {
* set.
*/
static boolean useRealScrolling() {
- return useRealGraphics() || Boolean.getBoolean("robolectric.useRealScrolling");
+ return useRealGraphics()
+ || Boolean.parseBoolean(System.getProperty("robolectric.useRealScrolling", "true"));
}
}