Make PlayerView fold aware

PiperOrigin-RevId: 523413988
This commit is contained in:
Googler 2023-04-11 16:51:01 +01:00 committed by Rohit Singh
parent d43fe3470f
commit 509830f38f
3 changed files with 88 additions and 0 deletions

View File

@ -54,6 +54,7 @@ project.ext {
androidxTestRulesVersion = '1.4.0'
androidxTestServicesStorageVersion = '1.4.0'
androidxTestTruthVersion = '1.4.0'
androidxWindowVersion = '1.0.0'
truthVersion = '1.1.3'
okhttpVersion = '4.9.2'
modulePrefix = ':'

View File

@ -25,7 +25,10 @@ dependencies {
implementation project(modulePrefix + 'lib-common')
implementation 'androidx.media:media:' + androidxMediaVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'androidx.core:core:' + androidxCoreVersion
implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
implementation 'androidx.window:window:' + androidxWindowVersion
implementation 'androidx.window:window-java:' + androidxWindowVersion
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
testImplementation project(modulePrefix + 'test-utils')

View File

@ -26,7 +26,10 @@ import static androidx.media3.common.util.Util.getDrawable;
import static java.lang.annotation.ElementType.TYPE_USE;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
@ -53,6 +56,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.core.util.Consumer;
import androidx.media3.common.AdOverlayInfo;
import androidx.media3.common.AdViewProvider;
import androidx.media3.common.C;
@ -71,6 +75,13 @@ import androidx.media3.common.util.RepeatModeUtil;
import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util;
import androidx.media3.ui.AspectRatioFrameLayout.ResizeMode;
import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
import androidx.window.layout.DisplayFeature;
import androidx.window.layout.FoldingFeature;
import androidx.window.layout.FoldingFeature.Orientation;
import androidx.window.layout.FoldingFeature.State;
import androidx.window.layout.WindowInfoTracker;
import androidx.window.layout.WindowLayoutInfo;
import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@ -79,6 +90,7 @@ import java.lang.annotation.Target;
import java.util.ArrayList;
import java.util.List;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/**
@ -267,6 +279,9 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
private boolean controllerHideOnTouch;
private int textureViewRotation;
private boolean isTouching;
private boolean isTabletop;
private final WindowInfoTrackerCallbackAdapter windowInfoTracker;
@MonotonicNonNull private Consumer<WindowLayoutInfo> layoutStateChangeCallback;
public PlayerView(Context context) {
this(context, /* attrs= */ null);
@ -280,6 +295,9 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
isTabletop = false;
windowInfoTracker =
new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(context));
componentListener = new ComponentListener();
if (isInEditMode()) {
@ -577,6 +595,25 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
}
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
layoutStateChangeCallback = this::consumeWindowLayoutInfo;
@Nullable Activity activity = getActivity();
if (activity != null) {
windowInfoTracker.addWindowLayoutInfoListener(
activity, ContextCompat.getMainExecutor(getContext()), layoutStateChangeCallback);
}
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
if (layoutStateChangeCallback != null) {
windowInfoTracker.removeWindowLayoutInfoListener(layoutStateChangeCallback);
}
}
/**
* Sets the {@link ResizeMode}.
*
@ -1523,6 +1560,53 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
|| keyCode == KeyEvent.KEYCODE_DPAD_CENTER;
}
@Nullable
private Activity getActivity() {
Context context = getContext();
while (context instanceof ContextWrapper) {
if (context instanceof Activity) {
return (Activity) context;
}
context = ((ContextWrapper) context).getBaseContext();
}
return null;
}
@Override
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
isTabletop = false;
}
private void consumeWindowLayoutInfo(WindowLayoutInfo windowLayoutInfo) {
List<DisplayFeature> features = windowLayoutInfo.getDisplayFeatures();
int foldingFeatureIndex = C.INDEX_UNSET;
for (int i = 0; i < features.size(); i++) {
DisplayFeature feature = features.get(i);
if (feature instanceof FoldingFeature) {
if (foldingFeatureIndex != C.INDEX_UNSET) {
// For now, we are only handling single folding features like tabletop and book fold.
return;
}
foldingFeatureIndex = i;
}
}
if (foldingFeatureIndex != C.INDEX_UNSET) {
handleFoldingFeature((FoldingFeature) features.get(foldingFeatureIndex));
}
}
private void handleFoldingFeature(FoldingFeature feature) {
boolean isTabletopFeature =
feature.getOrientation() == Orientation.HORIZONTAL
&& feature.getState() == State.HALF_OPENED;
// Only enter or exit tabletop if different than current orientation and state
if (isTabletopFeature != isTabletop) {
isTabletop = isTabletopFeature;
}
}
// Implementing the deprecated PlayerControlView.VisibilityListener and
// PlayerControlView.OnFullScreenModeChangedListener for now.
@SuppressWarnings("deprecation")