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

Minor cleanup to AspectRatioFrameLayout

Browse Source
This commit is contained in:
Oliver Woodman 2017-09-04 11:34:57 +01:00
parent 1a6a6c901f
commit 74b8c45e6d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,8 @@ 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_ZOOM}) @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL,
RESIZE_MODE_ZOOM})
public @interface ResizeMode {} public @interface ResizeMode {}
/** /**
@ -52,7 +53,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
*/ */
public static final int RESIZE_MODE_FILL = 3; public static final int RESIZE_MODE_FILL = 3;
/** /**
* Either height or width is increased to obtain the desired aspect ratio. * Either the width or height is increased to obtain the desired aspect ratio.
*/ */
public static final int RESIZE_MODE_ZOOM = 4; public static final int RESIZE_MODE_ZOOM = 4;
@ -89,7 +90,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
} }
/** /**
* Set the aspect ratio that this view should satisfy. * Sets the aspect ratio that this view should satisfy.
* *
* @param widthHeightRatio The width to height ratio. * @param widthHeightRatio The width to height ratio.
*/ */
@ -101,12 +102,10 @@ public final class AspectRatioFrameLayout extends FrameLayout {
} }
/** /**
* Gets the resize mode. * Returns the resize mode.
*
* @return The resize mode.
*/ */
public int getResizeMode() { public @ResizeMode int getResizeMode() {
return this.resizeMode; return resizeMode;
} }
/** /**
@ -146,7 +145,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
width = (int) (height * videoAspectRatio); width = (int) (height * videoAspectRatio);
break; break;
case RESIZE_MODE_ZOOM: case RESIZE_MODE_ZOOM:
if (videoAspectRatio > viewAspectRatio) { if (aspectDeformation > 0) {
width = (int) (height * videoAspectRatio); width = (int) (height * videoAspectRatio);
} else { } else {
height = (int) (width / videoAspectRatio); height = (int) (width / videoAspectRatio);