diff options
| author | Dongwon Kang <dwkang@google.com> | 2014-07-25 11:41:02 +0900 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2014-07-31 16:16:00 +0900 |
| commit | 512017945a2cd192797d7ca404cba08d792877dd (patch) | |
| tree | 16d41fd7396dc424e5f984afb25c563063249a8b /src/com/android/tv | |
| parent | 3ee2db7cb32377781c8657907921540e1517aa8f (diff) | |
| download | TV-512017945a2cd192797d7ca404cba08d792877dd.tar.gz | |
Applying framework changes on TvTrackInfo in sample TV input.
This change addresses the following API council feedback:
TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
types); most of the time this Bundle will be null.
Bug: 16542165
Change-Id: I2b6ada405731332dddde2283cc514e4e0817c4ca
Diffstat (limited to 'src/com/android/tv')
| -rw-r--r-- | src/com/android/tv/TvActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/tv/ui/TunableTvView.java | 25 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java index c4ee5333..0e0c6b28 100644 --- a/src/com/android/tv/TvActivity.java +++ b/src/com/android/tv/TvActivity.java @@ -1201,9 +1201,8 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha // selection. List<TvTrackInfo> tracks = mTvView.getTracks(); for (TvTrackInfo track : tracks) { - Log.d(TAG, "lang - " + track.getString(TvTrackInfo.KEY_LANGUAGE)); - if (track.getInt(TvTrackInfo.KEY_TYPE) == TvTrackInfo.VALUE_TYPE_SUBTITLE - && !track.getBoolean(TvTrackInfo.KEY_IS_SELECTED)) { + Log.d(TAG, "lang - " + track.getLanguage()); + if (track.getType() == TvTrackInfo.TYPE_SUBTITLE) { Log.d(TAG, "selectTrack " + track); mTvView.selectTrack(track); break; diff --git a/src/com/android/tv/ui/TunableTvView.java b/src/com/android/tv/ui/TunableTvView.java index 008d1055..90e73122 100644 --- a/src/com/android/tv/ui/TunableTvView.java +++ b/src/com/android/tv/ui/TunableTvView.java @@ -115,17 +115,24 @@ public class TunableTvView extends FrameLayout implements StreamInfo { @Override public void onTrackInfoChanged(String inputId, List<TvTrackInfo> tracks) { - for (TvTrackInfo track : tracks) { - int type = track.getInt(TvTrackInfo.KEY_TYPE); - boolean selected = track.getBoolean(TvTrackInfo.KEY_IS_SELECTED); - if (type == TvTrackInfo.VALUE_TYPE_VIDEO && selected) { - mVideoWidth = track.getInt(TvTrackInfo.KEY_WIDTH); - mVideoHeight = track.getInt(TvTrackInfo.KEY_HEIGHT); + if (mOnTuneListener != null) { + mOnTuneListener.onStreamInfoChanged(TunableTvView.this); + } + } + + @Override + public void onTrackSelectionChanged(String inputId, + List<TvTrackInfo> selectedTracks) { + for (TvTrackInfo track : selectedTracks) { + int type = track.getType(); + if (type == TvTrackInfo.TYPE_VIDEO) { + mVideoWidth = track.getVideoWidth(); + mVideoHeight = track.getVideoHeight(); mVideoFormat = Utils.getVideoDefinitionLevelFromSize( mVideoWidth, mVideoHeight); - } else if (type == TvTrackInfo.VALUE_TYPE_AUDIO && selected) { - mAudioChannelCount = track.getInt(TvTrackInfo.KEY_CHANNEL_COUNT); - } else if (type == TvTrackInfo.VALUE_TYPE_SUBTITLE) { + } else if (type == TvTrackInfo.TYPE_AUDIO) { + mAudioChannelCount = track.getAudioChannelCount(); + } else if (type == TvTrackInfo.TYPE_SUBTITLE) { mHasClosedCaption = true; } } |