loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues 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 e1d3f1b863ed195a2bbf9a40d05da97b193383f5)
This commit is contained in:
ibaker 2022-10-14 15:21:58 +00:00 committed by microkatz
parent 632c9cb57d
commit 2382016e7b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ui/src/main/java/androidx/media3/ui/AspectRatioFrameLayout.java
View File

@ -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);

2
libraries/ui/src/main/java/androidx/media3/ui/CanvasSubtitleOutput.java
View File

@ -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;

2
libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
View File

@ -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;

2
libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java
View File

@ -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;

8
libraries/ui/src/main/java/androidx/media3/ui/SubtitlePainter.java
View File

@ -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;

2
libraries/ui/src/main/java/androidx/media3/ui/SubtitleView.java
View File

@ -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;