loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
PiperOrigin-RevId: 481150758
(cherry picked from commit 871a5e685e9bc78544107c803306320e7d53ee53)
This commit is contained in:
ibaker 2022-10-14 15:21:58 +00:00 committed by microkatz
parent d9c60dc966
commit 12314abbf0
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
View File

@ -95,7 +95,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
@Nullable private AspectRatioListener aspectRatioListener; @Nullable private AspectRatioListener aspectRatioListener;
private float videoAspectRatio; private float videoAspectRatio;
@ResizeMode private int resizeMode; private @ResizeMode int resizeMode;
public AspectRatioFrameLayout(Context context) { public AspectRatioFrameLayout(Context context) {
this(context, /* attrs= */ null); this(context, /* attrs= */ null);

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/CanvasSubtitleOutput.java
View File

@ -37,7 +37,7 @@ import java.util.List;
private final List<SubtitlePainter> painters; private final List<SubtitlePainter> painters;
private List<Cue> cues; private List<Cue> cues;
@Cue.TextSizeType private int textSizeType; private @Cue.TextSizeType int textSizeType;
private float textSize; private float textSize;
private CaptionStyleCompat style; private CaptionStyleCompat style;
private float bottomPaddingFraction; private float bottomPaddingFraction;

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/CaptionStyleCompat.java
View File

@ -93,7 +93,7 @@ public final class CaptionStyleCompat {
* <li>{@link #EDGE_TYPE_DEPRESSED} * <li>{@link #EDGE_TYPE_DEPRESSED}
* </ul> * </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}. */ /** The preferred edge color, if using an edge type other than {@link #EDGE_TYPE_NONE}. */
public final int edgeColor; public final int edgeColor;

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
View File

@ -705,7 +705,7 @@ public class PlayerNotificationManager {
private int color; private int color;
@DrawableRes private int smallIconResourceId; @DrawableRes private int smallIconResourceId;
private int visibility; private int visibility;
@Priority private int priority; private @Priority int priority;
private boolean useChronometer; private boolean useChronometer;
@Nullable private String groupKey; @Nullable private String groupKey;

8
library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
View File

@ -67,17 +67,17 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@Nullable private Alignment cueTextAlignment; @Nullable private Alignment cueTextAlignment;
@Nullable private Bitmap cueBitmap; @Nullable private Bitmap cueBitmap;
private float cueLine; private float cueLine;
@Cue.LineType private int cueLineType; private @Cue.LineType int cueLineType;
@Cue.AnchorType private int cueLineAnchor; private @Cue.AnchorType int cueLineAnchor;
private float cuePosition; private float cuePosition;
@Cue.AnchorType private int cuePositionAnchor; private @Cue.AnchorType int cuePositionAnchor;
private float cueSize; private float cueSize;
private float cueBitmapHeight; private float cueBitmapHeight;
private int foregroundColor; private int foregroundColor;
private int backgroundColor; private int backgroundColor;
private int windowColor; private int windowColor;
private int edgeColor; private int edgeColor;
@CaptionStyleCompat.EdgeType private int edgeType; private @CaptionStyleCompat.EdgeType int edgeType;
private float defaultTextSizePx; private float defaultTextSizePx;
private float cueTextSizePx; private float cueTextSizePx;
private float bottomPaddingFraction; private float bottomPaddingFraction;

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
View File

@ -118,7 +118,7 @@ public final class SubtitleView extends FrameLayout {
private List<Cue> cues; private List<Cue> cues;
private CaptionStyleCompat style; private CaptionStyleCompat style;
@Cue.TextSizeType private int defaultTextSizeType; private @Cue.TextSizeType int defaultTextSizeType;
private float defaultTextSize; private float defaultTextSize;
private float bottomPaddingFraction; private float bottomPaddingFraction;
private boolean applyEmbeddedStyles; private boolean applyEmbeddedStyles;