loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update views when a new track name provider is set

Browse Source 
Also update TrackSelectionView with nullness annotations.

Issue: #4263

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=196849706
This commit is contained in:
andrewlewis 2018-05-16 10:34:38 -07:00 committed by Andrew Lewis
parent 7d76685e60
commit e23392a4fe
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
View File

@ -21,6 +21,8 @@ import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.support.annotation.AttrRes;
import android.support.annotation.Nullable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Pair; import android.util.Pair;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -54,7 +56,7 @@ public class TrackSelectionView extends LinearLayout {
private int rendererIndex; private int rendererIndex;
private TrackGroupArray trackGroups; private TrackGroupArray trackGroups;
private boolean isDisabled; private boolean isDisabled;
private SelectionOverride override; private @Nullable SelectionOverride override;
/** /**
* Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it. * Gets a pair consisting of a dialog and the {@link TrackSelectionView} that will be shown by it.
@ -100,11 +102,13 @@ public class TrackSelectionView extends LinearLayout {
this(context, null); this(context, null);
} }
public TrackSelectionView(Context context, AttributeSet attrs) { public TrackSelectionView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0); this(context, attrs, 0);
} }
public TrackSelectionView(Context context, AttributeSet attrs, int defStyleAttr) { @SuppressWarnings("nullness")
public TrackSelectionView(
Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
TypedArray attributeArray = TypedArray attributeArray =
context context
@ -152,7 +156,7 @@ public class TrackSelectionView extends LinearLayout {
* @param allowAdaptiveSelections Whether adaptive selection is enabled. * @param allowAdaptiveSelections Whether adaptive selection is enabled.
*/ */
public void setAllowAdaptiveSelections(boolean allowAdaptiveSelections) { public void setAllowAdaptiveSelections(boolean allowAdaptiveSelections) {
if (!this.allowAdaptiveSelections == allowAdaptiveSelections) { if (this.allowAdaptiveSelections != allowAdaptiveSelections) {
this.allowAdaptiveSelections = allowAdaptiveSelections; this.allowAdaptiveSelections = allowAdaptiveSelections;
updateViews(); updateViews();
} }
@ -168,12 +172,14 @@ public class TrackSelectionView extends LinearLayout {
} }
/** /**
* Sets the {@link TrackNameProvider} used to generate the user visible name of each track. * Sets the {@link TrackNameProvider} used to generate the user visible name of each track and
* updates the view with track names queried from the specified provider.
* *
* @param trackNameProvider The {@link TrackNameProvider} to use. * @param trackNameProvider The {@link TrackNameProvider} to use.
*/ */
public void setTrackNameProvider(TrackNameProvider trackNameProvider) { public void setTrackNameProvider(TrackNameProvider trackNameProvider) {
this.trackNameProvider = Assertions.checkNotNull(trackNameProvider); this.trackNameProvider = Assertions.checkNotNull(trackNameProvider);
updateViews();
} }
/** /**
@ -306,20 +312,20 @@ public class TrackSelectionView extends LinearLayout {
override = new SelectionOverride(groupIndex, trackIndex); override = new SelectionOverride(groupIndex, trackIndex);
} else { } else {
// An existing override is being modified. // An existing override is being modified.
boolean isEnabled = ((CheckedTextView) view).isChecked();
int overrideLength = override.length; int overrideLength = override.length;
if (isEnabled) { int[] overrideTracks = override.tracks;
if (((CheckedTextView) view).isChecked()) {
// Remove the track from the override. // Remove the track from the override.
if (overrideLength == 1) { if (overrideLength == 1) {
// The last track is being removed, so the override becomes empty. // The last track is being removed, so the override becomes empty.
override = null; override = null;
isDisabled = true; isDisabled = true;
} else { } else {
int[] tracks = getTracksRemoving(override.tracks, trackIndex); int[] tracks = getTracksRemoving(overrideTracks, trackIndex);
override = new SelectionOverride(groupIndex, tracks); override = new SelectionOverride(groupIndex, tracks);
} }
} else { } else {
int[] tracks = getTracksAdding(override.tracks, trackIndex); int[] tracks = getTracksAdding(overrideTracks, trackIndex);
override = new SelectionOverride(groupIndex, tracks); override = new SelectionOverride(groupIndex, tracks);
} }
} }