sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-26 14:57:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate overrides of deprecated AdsViewProvider.getAdOverlayViews

Browse source 
PiperOrigin-RevId: 321121735
This commit is contained in:
ibaker 2020-07-14 10:24:05 +01:00 committed by Oliver Woodman
parent e9a8335381
commit b48a762f20
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extensions/ima/build.gradle
View file

@ -35,6 +35,7 @@ dependencies {
androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
androidTestImplementation 'com.google.guava:guava:' + guavaVersion
androidTestCompileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion androidTestCompileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
testImplementation 'com.google.guava:guava:' + guavaVersion testImplementation 'com.google.guava:guava:' + guavaVersion

8
extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java
View file

@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.view.Surface; import android.view.Surface;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -39,6 +38,7 @@ import com.google.android.exoplayer2.decoder.DecoderCounters;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ads.AdsLoader;
import com.google.android.exoplayer2.source.ads.AdsLoader.AdViewProvider; import com.google.android.exoplayer2.source.ads.AdsLoader.AdViewProvider;
import com.google.android.exoplayer2.source.ads.AdsMediaSource; import com.google.android.exoplayer2.source.ads.AdsMediaSource;
import com.google.android.exoplayer2.testutil.ActionSchedule; import com.google.android.exoplayer2.testutil.ActionSchedule;
@ -50,6 +50,7 @@ import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -249,14 +250,15 @@ public final class ImaPlaybackTest {
dataSourceFactory, dataSourceFactory,
Assertions.checkNotNull(imaAdsLoader), Assertions.checkNotNull(imaAdsLoader),
new AdViewProvider() { new AdViewProvider() {
@Override @Override
public ViewGroup getAdViewGroup() { public ViewGroup getAdViewGroup() {
return overlayFrameLayout; return overlayFrameLayout;
} }
@Override @Override
public View[] getAdOverlayViews() { public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
return new View[0]; return ImmutableList.of();
} }
}); });
} }

8
extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
View file

@ -116,7 +116,6 @@ public final class ImaAdsLoaderTest {
@Mock private AdEvent mockPostrollFetchErrorAdEvent; @Mock private AdEvent mockPostrollFetchErrorAdEvent;
private ViewGroup adViewGroup; private ViewGroup adViewGroup;
private View adOverlayView;
private AdsLoader.AdViewProvider adViewProvider; private AdsLoader.AdViewProvider adViewProvider;
private AdEvent.AdEventListener adEventListener; private AdEvent.AdEventListener adEventListener;
private ContentProgressProvider contentProgressProvider; private ContentProgressProvider contentProgressProvider;
@ -129,7 +128,7 @@ public final class ImaAdsLoaderTest {
public void setUp() { public void setUp() {
setupMocks(); setupMocks();
adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext()); adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
adOverlayView = new View(ApplicationProvider.getApplicationContext()); View adOverlayView = new View(ApplicationProvider.getApplicationContext());
adViewProvider = adViewProvider =
new AdsLoader.AdViewProvider() { new AdsLoader.AdViewProvider() {
@Override @Override
@ -138,8 +137,9 @@ public final class ImaAdsLoaderTest {
} }
@Override @Override
public View[] getAdOverlayViews() { public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
return new View[] {adOverlayView}; return ImmutableList.of(
new AdsLoader.OverlayInfo(adOverlayView, AdsLoader.OverlayInfo.PURPOSE_CLOSE_AD));
} }
}; };
} }