From 4f2fae4fba2c3ad36bf3a01e154a53884becc49c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 12 Jul 2017 11:55:49 -0700
Subject: [PATCH] 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
---
 .../android/exoplayer2/demo/TrackSelectionHelper.java      | 7 +------
 demo/src/main/res/values/strings.xml                       | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java b/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
index 033b515767..fb7217f8fd 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
@@ -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);
diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml
index 57a05d24cd..cc6357c574 100644
--- a/demo/src/main/res/values/strings.xml
+++ b/demo/src/main/res/values/strings.xml
@@ -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>