Minor tweak to demo app
"Default (none)" is sometimes just wrong, since the track selector may attempt to select a track even if it exceeds the renderer's capabilities. Just "Default", as it used to be, was more accurate. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161695241
This commit is contained in:
parent
0da2299c49
commit
4f2fae4fba
@ -136,7 +136,6 @@ import java.util.Arrays;
|
||||
root.addView(defaultView);
|
||||
|
||||
// Per-track views.
|
||||
boolean haveSupportedTracks = false;
|
||||
boolean haveAdaptiveTracks = false;
|
||||
trackViews = new CheckedTextView[trackGroups.length][];
|
||||
for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
|
||||
@ -159,7 +158,6 @@ import java.util.Arrays;
|
||||
trackView.setFocusable(true);
|
||||
trackView.setTag(Pair.create(groupIndex, trackIndex));
|
||||
trackView.setOnClickListener(this);
|
||||
haveSupportedTracks = true;
|
||||
} else {
|
||||
trackView.setFocusable(false);
|
||||
trackView.setEnabled(false);
|
||||
@ -169,10 +167,7 @@ import java.util.Arrays;
|
||||
}
|
||||
}
|
||||
|
||||
if (!haveSupportedTracks) {
|
||||
// Indicate that the default selection will be nothing.
|
||||
defaultView.setText(R.string.selection_default_none);
|
||||
} else if (haveAdaptiveTracks) {
|
||||
if (haveAdaptiveTracks) {
|
||||
// View for using random adaptation.
|
||||
enableRandomAdaptationView = (CheckedTextView) inflater.inflate(
|
||||
android.R.layout.simple_list_item_multiple_choice, root, false);
|
||||
|
@ -30,8 +30,6 @@
|
||||
|
||||
<string name="selection_default">Default</string>
|
||||
|
||||
<string name="selection_default_none">Default (none)</string>
|
||||
|
||||
<string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
|
||||
|
||||
<string name="enable_random_adaptation">Enable random adaptation</string>
|
||||
|
Loading…
x
Reference in New Issue
Block a user