Fix the position of IntDef annotations on fields in the UI module

PiperOrigin-RevId: 481150758
DiceTechnology · Oct 20, 2022 · 871a5e6 · 871a5e6
1 parent 026699b
commit 871a5e6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 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
@@ -95,7 +95,7 @@ void onAspectRatioUpdated(
   @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
@@ -37,7 +37,7 @@
   private final List<SubtitlePainter> painters;
 
   private List<Cue> 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
@@ -93,7 +93,7 @@ public final class CaptionStyleCompat {
    *   <li>{@link #EDGE_TYPE_DEPRESSED}
    * </ul>
    */
-  @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
@@ -705,7 +705,7 @@ public void onBitmap(final Bitmap bitmap) {
   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
@@ -67,17 +67,17 @@
   @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
@@ -118,7 +118,7 @@ void update(
 
   private List<Cue> cues;
   private CaptionStyleCompat style;
-  @Cue.TextSizeType private int defaultTextSizeType;
+  private @Cue.TextSizeType int defaultTextSizeType;
   private float defaultTextSize;
   private float bottomPaddingFraction;
   private boolean applyEmbeddedStyles;