summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/transition/Fade.java2
-rw-r--r--core/java/android/transition/Slide.java2
-rw-r--r--core/java/android/transition/Visibility.java6
3 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/transition/Fade.java b/core/java/android/transition/Fade.java
index 38b89dc4193f..41d80fce2a6e 100644
--- a/core/java/android/transition/Fade.java
+++ b/core/java/android/transition/Fade.java
@@ -94,7 +94,7 @@ public class Fade extends Visibility {
* @param fadingMode The behavior of this transition, a combination of
* {@link #IN} and {@link #OUT}.
*/
- public Fade(int fadingMode) {
+ public Fade(@VisibilityMode int fadingMode) {
setMode(fadingMode);
}
diff --git a/core/java/android/transition/Slide.java b/core/java/android/transition/Slide.java
index 9cf321014ff8..14a513b07dc8 100644
--- a/core/java/android/transition/Slide.java
+++ b/core/java/android/transition/Slide.java
@@ -147,7 +147,7 @@ public class Slide extends Visibility {
/**
* Constructor using the provided slide edge direction.
*/
- public Slide(int slideEdge) {
+ public Slide(@GravityFlag int slideEdge) {
setSlideEdge(slideEdge);
}
diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java
index 77c652ecf5f9..319f080bbe63 100644
--- a/core/java/android/transition/Visibility.java
+++ b/core/java/android/transition/Visibility.java
@@ -52,9 +52,11 @@ public abstract class Visibility extends Transition {
/** @hide */
@Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, prefix = { "MODE_" }, value = {
+ @IntDef(flag = true, value = {
MODE_IN,
- MODE_OUT
+ MODE_OUT,
+ Fade.IN,
+ Fade.OUT
})
@interface VisibilityMode {}