Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d

am: 0550a7221b

Change-Id: Id38d8bc09ffbf856c8976893096c47d3bcc8b8b7

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/tv/ui/sidepanel/ClosedCaptionFragment.java b/src/com/android/tv/ui/sidepanel/ClosedCaptionFragment.java
index d6ccdf6b..e5c23372 100644
--- a/src/com/android/tv/ui/sidepanel/ClosedCaptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/ClosedCaptionFragment.java
@@ -82,8 +82,9 @@ public class ClosedCaptionFragment extends SideFragment {
             }
             mItems.add(item);
 
-            for (final TvTrackInfo track : tracks) {
-                item = new ClosedCaptionOptionItem(getLabel(track),
+            for (int i = 0; i < tracks.size(); i++) {
+                final TvTrackInfo track = tracks.get(i);
+                item = new ClosedCaptionOptionItem(getLabel(track, i),
                         CaptionSettings.OPTION_ON, track.getId(), track.getLanguage());
                 if (isEnabled && track.getId().equals(trackId)) {
                     item.setChecked(true);
@@ -172,11 +173,11 @@ public class ClosedCaptionFragment extends SideFragment {
         super.onDestroyView();
     }
 
-    private String getLabel(TvTrackInfo track) {
+    private String getLabel(TvTrackInfo track, int trackIndex) {
         if (track.getLanguage() != null) {
             return new Locale(track.getLanguage()).getDisplayName();
         }
-        return getString(R.string.default_language);
+        return getString(R.string.closed_caption_unknown_language, trackIndex + 1);
     }
 
     private class ClosedCaptionOptionItem extends RadioButtonItem {