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

Fully reset state when displaying track selections.

Browse source 
When showing a track selection for a renderer, the override
variable could end up being retained from some previous call
to show a track selection for some other renderer.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117557994
This commit is contained in:
olly 2016-03-18 10:08:09 -07:00 committed by Oliver Woodman
parent 03ed811c7c
commit 4a38b2cade
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
demo/src/main/java/com/google/android/exoplayer/demo/ui/TrackSelectionHelper.java
View file

@ -46,18 +46,17 @@ public class TrackSelectionHelper implements View.OnClickListener, DialogInterfa
private final DefaultTrackSelector selector; private final DefaultTrackSelector selector;
private CheckedTextView disableView;
private CheckedTextView defaultView;
private CheckedTextView[][] trackViews;
private TrackInfo trackInfo; private TrackInfo trackInfo;
private int rendererIndex; private int rendererIndex;
private TrackGroupArray trackGroups; private TrackGroupArray trackGroups;
private boolean[] trackGroupsAdaptive; private boolean[] trackGroupsAdaptive;
private boolean isDisabled; private boolean isDisabled;
private TrackSelection override; private TrackSelection override;
private CheckedTextView disableView;
private CheckedTextView defaultView;
private CheckedTextView[][] trackViews;
/** /**
* @param selector The track selector. * @param selector The track selector.
*/ */
@ -85,9 +84,8 @@ public class TrackSelectionHelper implements View.OnClickListener, DialogInterfa
!= TrackRenderer.ADAPTIVE_NOT_SUPPORTED; != TrackRenderer.ADAPTIVE_NOT_SUPPORTED;
} }
isDisabled = selector.getRendererDisabled(rendererIndex); isDisabled = selector.getRendererDisabled(rendererIndex);
if (selector.hasSelectionOverride(rendererIndex, trackGroups)) { override = selector.hasSelectionOverride(rendererIndex, trackGroups)
override = trackInfo.getTrackSelection(rendererIndex); ? trackInfo.getTrackSelection(rendererIndex) : null;
}
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(titleId) builder.setTitle(titleId)