From 12314abbf0531c2bcc95eca143325cd57379039e Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 14 Oct 2022 15:21:58 +0000 Subject: [PATCH] Fix the position of IntDef annotations on fields in the UI module PiperOrigin-RevId: 481150758 (cherry picked from commit 871a5e685e9bc78544107c803306320e7d53ee53) --- .../android/exoplayer2/ui/AspectRatioFrameLayout.java | 2 +- .../android/exoplayer2/ui/CanvasSubtitleOutput.java | 2 +- .../google/android/exoplayer2/ui/CaptionStyleCompat.java | 2 +- .../android/exoplayer2/ui/PlayerNotificationManager.java | 2 +- .../com/google/android/exoplayer2/ui/SubtitlePainter.java | 8 ++++---- .../com/google/android/exoplayer2/ui/SubtitleView.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java index 5ad88c29d7..23deb94951 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java @@ -95,7 +95,7 @@ public final class AspectRatioFrameLayout extends FrameLayout { @Nullable private AspectRatioListener aspectRatioListener; private float videoAspectRatio; - @ResizeMode private int resizeMode; + private @ResizeMode int resizeMode; public AspectRatioFrameLayout(Context context) { this(context, /* attrs= */ null); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/CanvasSubtitleOutput.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/CanvasSubtitleOutput.java index f0826ce35b..a855bd96e7 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/CanvasSubtitleOutput.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/CanvasSubtitleOutput.java @@ -37,7 +37,7 @@ import java.util.List; private final List painters; private List cues; - @Cue.TextSizeType private int textSizeType; + private @Cue.TextSizeType int textSizeType; private float textSize; private CaptionStyleCompat style; private float bottomPaddingFraction; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/CaptionStyleCompat.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/CaptionStyleCompat.java index 93761fedd9..f7da091ff1 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/CaptionStyleCompat.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/CaptionStyleCompat.java @@ -93,7 +93,7 @@ public final class CaptionStyleCompat { *
  • {@link #EDGE_TYPE_DEPRESSED} * */ - @EdgeType public final int edgeType; + public final @EdgeType int edgeType; /** The preferred edge color, if using an edge type other than {@link #EDGE_TYPE_NONE}. */ public final int edgeColor; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index d841558284..316343d790 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -705,7 +705,7 @@ public class PlayerNotificationManager { private int color; @DrawableRes private int smallIconResourceId; private int visibility; - @Priority private int priority; + private @Priority int priority; private boolean useChronometer; @Nullable private String groupKey; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java index e21e0aa2dd..48707e3247 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java @@ -67,17 +67,17 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; @Nullable private Alignment cueTextAlignment; @Nullable private Bitmap cueBitmap; private float cueLine; - @Cue.LineType private int cueLineType; - @Cue.AnchorType private int cueLineAnchor; + private @Cue.LineType int cueLineType; + private @Cue.AnchorType int cueLineAnchor; private float cuePosition; - @Cue.AnchorType private int cuePositionAnchor; + private @Cue.AnchorType int cuePositionAnchor; private float cueSize; private float cueBitmapHeight; private int foregroundColor; private int backgroundColor; private int windowColor; private int edgeColor; - @CaptionStyleCompat.EdgeType private int edgeType; + private @CaptionStyleCompat.EdgeType int edgeType; private float defaultTextSizePx; private float cueTextSizePx; private float bottomPaddingFraction; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java index 47b3facdca..77477ae630 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java @@ -118,7 +118,7 @@ public final class SubtitleView extends FrameLayout { private List cues; private CaptionStyleCompat style; - @Cue.TextSizeType private int defaultTextSizeType; + private @Cue.TextSizeType int defaultTextSizeType; private float defaultTextSize; private float bottomPaddingFraction; private boolean applyEmbeddedStyles;