Added a comment and excluded automatic switch of orientation on tablets and Android TVs
This commit is contained in:
parent
886a949a00
commit
f41549ccf1
|
@ -360,11 +360,11 @@ public abstract class VideoPlayer extends BasePlayer
|
|||
return true;
|
||||
});
|
||||
// apply caption language from previous user preference
|
||||
if (userPreferredLanguage != null && (captionLanguage.equals(userPreferredLanguage)
|
||||
|| searchForAutogenerated && captionLanguage.startsWith(userPreferredLanguage)
|
||||
|| userPreferredLanguage.contains("(") && captionLanguage.startsWith(
|
||||
userPreferredLanguage
|
||||
.substring(0, userPreferredLanguage.indexOf('('))))) {
|
||||
if (userPreferredLanguage != null
|
||||
&& (captionLanguage.equals(userPreferredLanguage)
|
||||
|| (searchForAutogenerated && captionLanguage.startsWith(userPreferredLanguage))
|
||||
|| (userPreferredLanguage.contains("(") && captionLanguage.startsWith(
|
||||
userPreferredLanguage.substring(0, userPreferredLanguage.indexOf('(')))))) {
|
||||
final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
|
||||
if (textRendererIndex != RENDERER_UNAVAILABLE) {
|
||||
trackSelector.setPreferredTextLanguage(captionLanguage);
|
||||
|
|
|
@ -956,6 +956,8 @@ public class VideoPlayerImpl extends VideoPlayer
|
|||
if (orientationLocked
|
||||
&& isFullscreen()
|
||||
&& service.isLandscape() == isVerticalVideo
|
||||
&& !DeviceUtils.isTv(service)
|
||||
&& !DeviceUtils.isTablet(service)
|
||||
&& fragmentListener != null) {
|
||||
fragmentListener.onScreenRotationButtonClicked();
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import android.util.AttributeSet;
|
|||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||
|
||||
public class CustomCollapsingToolbarLayout extends CollapsingToolbarLayout {
|
||||
|
@ -27,8 +28,10 @@ public class CustomCollapsingToolbarLayout extends CollapsingToolbarLayout {
|
|||
}
|
||||
|
||||
/**
|
||||
* CollapsingToolbarLayout overrides our logic with fitsSystemWindows and ruins the layout.
|
||||
* Override Google's method
|
||||
* CollapsingToolbarLayout sets it's own setOnApplyInsetsListener which consumes
|
||||
* system insets {@link CollapsingToolbarLayout#onWindowInsetChanged(WindowInsetsCompat)}
|
||||
* so we will not receive them in subviews with fitsSystemWindows = true.
|
||||
* Override Google's behavior
|
||||
* */
|
||||
public void overrideListener() {
|
||||
ViewCompat.setOnApplyWindowInsetsListener(this, (v, insets) -> insets);
|
||||
|
|
Loading…
Reference in New Issue