sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to access the caption manager when in edit mode.

Browse source 
Issue: #1991

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137131819
This commit is contained in:
andrewlewis 2016-07-21 02:08:21 +01:00 committed by Oliver Woodman
parent 99503e6e3a
commit ba6368a07a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
View file

@ -46,6 +46,7 @@ public abstract class TrackSelector<T> {
* @param trackSelections The new track selections. * @param trackSelections The new track selections.
*/ */
void onTrackSelectionsChanged(TrackSelections<? extends T> trackSelections); void onTrackSelectionsChanged(TrackSelections<? extends T> trackSelections);
} }
private final Handler eventHandler; private final Handler eventHandler;

9
library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
View file

@ -122,10 +122,10 @@ public final class SubtitleView extends View implements TextRenderer.Output {
/** /**
* Sets the text size to one derived from {@link CaptioningManager#getFontScale()}, or to a * Sets the text size to one derived from {@link CaptioningManager#getFontScale()}, or to a
* default size on API level 19 and earlier. * default size before API level 19.
*/ */
public void setUserDefaultTextSize() { public void setUserDefaultTextSize() {
float fontScale = Util.SDK_INT >= 19 ? getUserCaptionFontScaleV19() : 1f; float fontScale = Util.SDK_INT >= 19 && !isInEditMode() ? getUserCaptionFontScaleV19() : 1f;
setFractionalTextSize(DEFAULT_TEXT_SIZE_FRACTION * fontScale); setFractionalTextSize(DEFAULT_TEXT_SIZE_FRACTION * fontScale);
} }
@ -180,10 +180,11 @@ public final class SubtitleView extends View implements TextRenderer.Output {
/** /**
* Sets the caption style to be equivalent to the one returned by * Sets the caption style to be equivalent to the one returned by
* {@link CaptioningManager#getUserStyle()}, or to a default style on API level 19 and earlier. * {@link CaptioningManager#getUserStyle()}, or to a default style before API level 19.
*/ */
public void setUserDefaultStyle() { public void setUserDefaultStyle() {
setStyle(Util.SDK_INT >= 19 ? getUserCaptionStyleV19() : CaptionStyleCompat.DEFAULT); setStyle(Util.SDK_INT >= 19 && !isInEditMode()
? getUserCaptionStyleV19() : CaptionStyleCompat.DEFAULT);
} }
/** /**