From 2382016e7bc13f884f47d88b090f937dfd4cf8e6 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
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 e1d3f1b863ed195a2bbf9a40d05da97b193383f5)
---
 .../java/androidx/media3/ui/AspectRatioFrameLayout.java   | 2 +-
 .../java/androidx/media3/ui/CanvasSubtitleOutput.java     | 2 +-
 .../main/java/androidx/media3/ui/CaptionStyleCompat.java  | 2 +-
 .../androidx/media3/ui/PlayerNotificationManager.java     | 2 +-
 .../src/main/java/androidx/media3/ui/SubtitlePainter.java | 8 ++++----
 .../ui/src/main/java/androidx/media3/ui/SubtitleView.java | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/ui/src/main/java/androidx/media3/ui/AspectRatioFrameLayout.java b/libraries/ui/src/main/java/androidx/media3/ui/AspectRatioFrameLayout.java
index 457559555e..c851dd4312 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/AspectRatioFrameLayout.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/AspectRatioFrameLayout.java
@@ -97,7 +97,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/libraries/ui/src/main/java/androidx/media3/ui/CanvasSubtitleOutput.java b/libraries/ui/src/main/java/androidx/media3/ui/CanvasSubtitleOutput.java
index be68d50ce2..e01e803e0a 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/CanvasSubtitleOutput.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/CanvasSubtitleOutput.java
@@ -37,7 +37,7 @@ import java.util.List;
   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/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java b/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
index 45373a2aac..531084cccd 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
@@ -95,7 +95,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/libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java
index 9502581c05..1a09119032 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java
@@ -707,7 +707,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/libraries/ui/src/main/java/androidx/media3/ui/SubtitlePainter.java b/libraries/ui/src/main/java/androidx/media3/ui/SubtitlePainter.java
index 6d2a4bb809..697024f1d8 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/SubtitlePainter.java
+++ b/libraries/ui/src/main/java/androidx/media3/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/libraries/ui/src/main/java/androidx/media3/ui/SubtitleView.java b/libraries/ui/src/main/java/androidx/media3/ui/SubtitleView.java
index c5b4fc048d..6e7285da64 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/SubtitleView.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/SubtitleView.java
@@ -120,7 +120,7 @@ public final class SubtitleView extends FrameLayout {
 
   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;