loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-12 10:09:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support aspect ratio fill mode for AspectRatioFrameLayout

Browse Source
This commit is contained in:
Bei Yi 2017-08-24 14:31:33 -07:00
parent f764fe70b0
commit 50c485652c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
* Resize modes for {@link AspectRatioFrameLayout}. * Resize modes for {@link AspectRatioFrameLayout}.
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_CROP}) @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_ASPECT_FILL})
public @interface ResizeMode {} public @interface ResizeMode {}
/** /**
@ -52,9 +52,9 @@ public final class AspectRatioFrameLayout extends FrameLayout {
*/ */
public static final int RESIZE_MODE_FILL = 3; public static final int RESIZE_MODE_FILL = 3;
/** /**
* The height or width is increased or decreased to crop and to obtain the desired aspect ratio. * Either height or width is increased to obtain the desired aspect ratio.
*/ */
public static final int RESIZE_MODE_CROP = 4; public static final int RESIZE_MODE_ASPECT_FILL = 4;
/** /**
* The {@link FrameLayout} will not resize itself if the fractional difference between its natural * The {@link FrameLayout} will not resize itself if the fractional difference between its natural
@ -145,7 +145,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
case RESIZE_MODE_FIXED_HEIGHT: case RESIZE_MODE_FIXED_HEIGHT:
width = (int) (height * videoAspectRatio); width = (int) (height * videoAspectRatio);
break; break;
case RESIZE_MODE_CROP: case RESIZE_MODE_ASPECT_FILL:
if (videoAspectRatio > viewAspectRatio) { if (videoAspectRatio > viewAspectRatio) {
width = (int) (height * videoAspectRatio); width = (int) (height * videoAspectRatio);
} else { } else {