Add AnimatedVectorDrawable support for VideoPreference

- We are planning to use animation vector drawable to replace mp4
file to reduce apk size
- Add vectorAnimation attr in VideoPreference
- Delegate VideoPreference media control to AnimationController

Bug: 143270527
Test: manual, robolectric
Change-Id: Ia5859f928a9082085cdf715c762f964e1c99e003
This commit is contained in:
Raff Tsai
2019-10-31 14:03:34 +08:00
parent e49ff7de26
commit 953da2ee40
6 changed files with 422 additions and 146 deletions

View File

@@ -18,26 +18,24 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.SurfaceTexture;
import android.media.MediaPlayer;
import android.view.LayoutInflater;
import android.view.TextureView;
import android.view.View;
import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;
import org.junit.Before;
import org.junit.Test;
@@ -46,14 +44,15 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowSettingsMediaPlayer.class)
public class VideoPreferenceTest {
private static final int VIDEO_WIDTH = 100;
private static final int VIDEO_HEIGHT = 150;
@Mock
private MediaPlayer mMediaPlayer;
private VideoPreference.AnimationController mAnimationController;
@Mock
private ImageView fakePreview;
@Mock
@@ -67,10 +66,12 @@ public class VideoPreferenceTest {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mAnimationController = spy(
new MediaAnimationController(mContext, R.raw.accessibility_screen_magnification));
mVideoPreference = new VideoPreference(mContext, null /* attrs */);
mVideoPreference.mMediaPlayer = mMediaPlayer;
when(mMediaPlayer.getVideoWidth()).thenReturn(VIDEO_WIDTH);
when(mMediaPlayer.getVideoHeight()).thenReturn(VIDEO_HEIGHT);
mVideoPreference.mAnimationController = mAnimationController;
when(mAnimationController.getVideoWidth()).thenReturn(VIDEO_WIDTH);
when(mAnimationController.getVideoHeight()).thenReturn(VIDEO_HEIGHT);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.video_preference, null));
@@ -91,17 +92,17 @@ public class VideoPreferenceTest {
@Test
public void onSurfaceTextureUpdated_viewInvisible_shouldNotStartPlayingVideo() {
final TextureView video =
(TextureView) mPreferenceViewHolder.findViewById(R.id.video_texture_view);
(TextureView) mPreferenceViewHolder.findViewById(R.id.video_texture_view);
mVideoPreference.mAnimationAvailable = true;
mVideoPreference.mVideoReady = true;
mVideoPreference.onViewInvisible();
mVideoPreference.onBindViewHolder(mPreferenceViewHolder);
when(mMediaPlayer.isPlaying()).thenReturn(false);
mAnimationController.attachView(video, fakePreview, fakePlayButton);
when(mAnimationController.isPlaying()).thenReturn(false);
final TextureView.SurfaceTextureListener listener = video.getSurfaceTextureListener();
mVideoPreference.onViewInvisible();
listener.onSurfaceTextureUpdated(mock(SurfaceTexture.class));
verify(mMediaPlayer, never()).start();
verify(mAnimationController, never()).start();
}
@Test
@@ -110,32 +111,30 @@ public class VideoPreferenceTest {
mVideoPreference.onViewInvisible();
verify(mMediaPlayer).release();
verify(mAnimationController).release();
}
@Test
public void updateViewStates_paused_updatesViews() {
when(mMediaPlayer.isPlaying()).thenReturn(true);
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
mAnimationController.start();
mVideoPreference.mAnimationController.attachView(new TextureView(mContext), fakePreview,
fakePlayButton);
verify(fakePlayButton).setVisibility(eq(View.VISIBLE));
verify(fakePreview).setVisibility(eq(View.VISIBLE));
verify(mMediaPlayer).pause();
assertThat(mAnimationController.isPlaying()).isFalse();
}
@Test
public void updateViewStates_playing_updatesViews() {
when(mMediaPlayer.isPlaying()).thenReturn(false);
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
mAnimationController.pause();
mVideoPreference.mAnimationController.attachView(new TextureView(mContext), fakePreview,
fakePlayButton);
verify(fakePlayButton).setVisibility(eq(View.GONE));
verify(fakePreview).setVisibility(eq(View.GONE));
verify(mMediaPlayer).start();
}
@Test
public void updateViewStates_noMediaPlayer_skips() {
mVideoPreference.mMediaPlayer = null;
mVideoPreference.updateViewStates(fakePreview, fakePlayButton);
verify(fakePlayButton, never()).setVisibility(anyInt());
verify(fakePreview, never()).setVisibility(anyInt());
assertThat(mAnimationController.isPlaying()).isTrue();
}
}