fix(android): default to newer scalingMode constant default value

tidev · Nov 2, 2020 · c151ff0 · c151ff0
1 parent 3e88518
commit c151ff0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/android/modules/media/src/java/android/widget/TiVideoView8.java b/android/modules/media/src/java/android/widget/TiVideoView8.java
@@ -190,7 +190,7 @@ private void constantDeprecationWarning(int constant)
 				break;
 			case MediaModule.VIDEO_SCALING_ASPECT_FIT:
 				message = String.format(MESSAGE_FORMAT, "Ti.Media.VIDEO_SCALING_ASPECT_FIT",
-										"Ti.Media.VIDEO_SCALING_RESIZE_ASPECT_FIT");
+										"Ti.Media.VIDEO_SCALING_RESIZE_ASPECT");
 				break;
 			case MediaModule.VIDEO_SCALING_MODE_FILL:
 				message =

diff --git a/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java b/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java
@@ -75,7 +75,7 @@ public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifec
 	public static final String PROPERTY_SEEK_TO_ON_RESUME = "__seek_to_on_resume__";
 
 	protected int mediaControlStyle = MediaModule.VIDEO_CONTROL_DEFAULT;
-	protected int scalingMode = MediaModule.VIDEO_SCALING_ASPECT_FIT;
+	protected int scalingMode = MediaModule.VIDEO_SCALING_RESIZE_ASPECT;
 	private int loadState = MediaModule.VIDEO_LOAD_STATE_UNKNOWN;
 	private int playbackState = MediaModule.VIDEO_PLAYBACK_STATE_STOPPED;
 	private int repeatMode = MediaModule.VIDEO_REPEAT_MODE_NONE;

diff --git a/tests/Resources/ti.media.videoplayer.test.js b/tests/Resources/ti.media.videoplayer.test.js
@@ -277,9 +277,9 @@ describe('Titanium.Media.VideoPlayer', () => {
 				}
 			});
 
-			it('defaults to Ti.Media.VIDEO_SCALING_ASPECT_FIT on Android, VIDEO_SCALING_RESIZE on iOS', () => {
+			it('defaults to Ti.Media.VIDEO_SCALING_RESIZE_ASPECT_FIT on Android, VIDEO_SCALING_RESIZE on iOS', () => {
 				if (OS_ANDROID) {
-					should(player.scalingMode).eql(Ti.Media.VIDEO_SCALING_ASPECT_FIT);
+					should(player.scalingMode).eql(Ti.Media.VIDEO_SCALING_RESIZE_ASPECT_FIT);
 				} else {
 					should(player.scalingMode).eql(Ti.Media.VIDEO_SCALING_RESIZE);
 				}