aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zhao <qingxun@google.com>2022-10-24 22:55:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-10-24 22:55:28 +0000
commitc08767dca06c6b10abca77477762a4bb78055664 (patch)
tree271a586f9d98668016184011a738da495ae68fb6
parent882ef25c4dd394aa04d8ab61a9dcbe25de7e100c (diff)
parenta6fc16acb1dd4dc4e663b33bcd43ede40a790b5b (diff)
downloadTV-c08767dca06c6b10abca77477762a4bb78055664.tar.gz
Merge "Add handling for selectTrack command"
-rw-r--r--src/com/android/tv/interactive/IAppManager.java23
1 files changed, 22 insertions, 1 deletions
diff --git a/src/com/android/tv/interactive/IAppManager.java b/src/com/android/tv/interactive/IAppManager.java
index 7c8e04c8..29de5930 100644
--- a/src/com/android/tv/interactive/IAppManager.java
+++ b/src/com/android/tv/interactive/IAppManager.java
@@ -16,6 +16,9 @@
package com.android.tv.interactive;
+import static com.android.tv.util.CaptionSettings.OPTION_OFF;
+import static com.android.tv.util.CaptionSettings.OPTION_ON;
+
import android.annotation.TargetApi;
import android.graphics.Rect;
import android.media.tv.TvTrackInfo;
@@ -221,7 +224,25 @@ public class IAppManager {
}
break;
case TvInteractiveAppService.PLAYBACK_COMMAND_TYPE_SELECT_TRACK:
- // TODO: Handle select track command
+ if (mTvView != null && parameters != null) {
+ int trackType = parameters.getInt(
+ TvInteractiveAppService.COMMAND_PARAMETER_KEY_TRACK_TYPE,
+ -1);
+ String trackId = parameters.getString(
+ TvInteractiveAppService.COMMAND_PARAMETER_KEY_TRACK_ID,
+ null);
+ switch (trackType) {
+ case TvTrackInfo.TYPE_AUDIO:
+ // When trackId is null, deselects current audio track.
+ mHandler.post(() -> mMainActivity.selectAudioTrack(trackId));
+ break;
+ case TvTrackInfo.TYPE_SUBTITLE:
+ // When trackId is null, turns off captions.
+ mHandler.post(() -> mMainActivity.selectSubtitleTrack(
+ trackId == null ? OPTION_OFF : OPTION_ON, trackId));
+ break;
+ }
+ }
break;
case TvInteractiveAppService.PLAYBACK_COMMAND_TYPE_SET_STREAM_VOLUME:
if (parameters == null) {