diff options
| author | Shraddha Basantwani <shraddha.basantwani@ittiam.com> | 2019-11-12 12:01:37 +0530 |
|---|---|---|
| committer | nchalko <nchalko@google.com> | 2019-11-13 23:39:25 +0000 |
| commit | 3533511bf2640aac59b51eac92e23d7f957dd1f3 (patch) | |
| tree | d4607ae9804c6ffefe2761edd0bd57897cda9bd2 /src/com/android | |
| parent | 93b357adc879308eaca61aaac6da7401cee2875f (diff) | |
| download | TV-3533511bf2640aac59b51eac92e23d7f957dd1f3.tar.gz | |
Simplify applyClosedCaption()
Test: m LiveTv
Bug: 133225624
Change-Id: Ibd07f1fb091936a5c7082b1417a086d955836bad
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/tv/MainActivity.java | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java index 7a591500..aeb51da4 100644 --- a/src/com/android/tv/MainActivity.java +++ b/src/com/android/tv/MainActivity.java @@ -1984,21 +1984,7 @@ public class MainActivity extends Activity TvTrackInfo track = tracks.get(i); if (Utils.isEqualLanguage(track.getLanguage(), language)) { if (track.getId().equals(trackId)) { - if (!track.getId().equals(selectedTrackId)) { - selectTrack(TvTrackInfo.TYPE_SUBTITLE, track, i); - } else { - // Already selected. Update the option string only. - mTvOptionsManager.onClosedCaptionsChanged(track, i); - } - if (DEBUG) { - Log.d( - TAG, - "Subtitle Track Selected {id=" - + track.getId() - + ", language=" - + track.getLanguage() - + "}"); - } + selectCaptionTrack(selectedTrackId, track, i); return; } else if (alternativeTrack == null) { alternativeTrack = track; @@ -2007,30 +1993,11 @@ public class MainActivity extends Activity } } if (alternativeTrack != null) { - if (!alternativeTrack.getId().equals(selectedTrackId)) { - selectTrack(TvTrackInfo.TYPE_SUBTITLE, alternativeTrack, alternativeTrackIndex); - } else { - mTvOptionsManager.onClosedCaptionsChanged( - alternativeTrack, alternativeTrackIndex); - } - if (DEBUG) { - Log.d( - TAG, - "Subtitle Track Selected {id=" - + alternativeTrack.getId() - + ", language=" - + alternativeTrack.getLanguage() - + "}"); - } + selectCaptionTrack(selectedTrackId, alternativeTrack, alternativeTrackIndex); return; } } - if (selectedTrackId != null) { - selectTrack(TvTrackInfo.TYPE_SUBTITLE, null, UNDEFINED_TRACK_INDEX); - if (DEBUG) Log.d(TAG, "Subtitle Track Unselected"); - return; - } - mTvOptionsManager.onClosedCaptionsChanged(null, UNDEFINED_TRACK_INDEX); + deselectCaptionTrack(selectedTrackId); } public void showProgramGuideSearchFragment() { @@ -2614,6 +2581,33 @@ public class MainActivity extends Activity } } + private void selectCaptionTrack(String selectedTrackId, TvTrackInfo track, int trackIndex) { + if (!track.getId().equals(selectedTrackId)) { + selectTrack(TvTrackInfo.TYPE_SUBTITLE, track, trackIndex); + } else { + // Already selected. Update the option string only. + mTvOptionsManager.onClosedCaptionsChanged(track, trackIndex); + } + if (DEBUG) { + Log.d( + TAG, + "Subtitle Track Selected {id=" + + track.getId() + + ", language=" + + track.getLanguage() + + "}"); + } + } + + private void deselectCaptionTrack(String selectedTrackId) { + if (selectedTrackId != null) { + selectTrack(TvTrackInfo.TYPE_SUBTITLE, null, UNDEFINED_TRACK_INDEX); + if (DEBUG) Log.d(TAG, "Subtitle Track Unselected"); + } else { + mTvOptionsManager.onClosedCaptionsChanged(null, UNDEFINED_TRACK_INDEX); + } + } + public void selectAudioTrack(String trackId) { saveMultiAudioSetting(trackId); applyMultiAudio(trackId); |