From a6d34ee8b4cbcda514274272188414f5ef107450 Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Wed, 24 Feb 2016 13:06:35 -0800 Subject: [PATCH] TIF: Define activity action to set up channel sources Bug: 24776978 Change-Id: Ib176217bb896fa10db73c5aa8568171b9f6e2fe7 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + media/java/android/media/tv/TvInputInfo.java | 3 ++- media/java/android/media/tv/TvInputManager.java | 8 ++++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 21d2645621c1e..80acb7d7ee85e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22989,6 +22989,7 @@ package android.media.tv { field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED"; field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED"; field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS"; + field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS"; field public static final int INPUT_STATE_CONNECTED = 0; // 0x0 field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1 field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2 diff --git a/api/system-current.txt b/api/system-current.txt index 351d58051c063..475acb50baf68 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24700,6 +24700,7 @@ package android.media.tv { field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED"; field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED"; field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS"; + field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS"; field public static final int INPUT_STATE_CONNECTED = 0; // 0x0 field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1 field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2 diff --git a/api/test-current.txt b/api/test-current.txt index 82176ae705558..b37062d02fe66 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22998,6 +22998,7 @@ package android.media.tv { field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED"; field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED"; field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS"; + field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS"; field public static final int INPUT_STATE_CONNECTED = 0; // 0x0 field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1 field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2 diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index b8a1374ff0778..ec65ffed0c053 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -105,7 +105,8 @@ public final class TvInputInfo implements Parcelable { public static final int TYPE_DISPLAY_PORT = 1008; /** - * The ID of the TV input to provide to the setup activity and settings activity. + * Used as a String extra field in setup intents created by {@link #createSetupIntent()} to + * supply the ID of a specific TV input to set up. */ public static final String EXTRA_INPUT_ID = "android.media.tv.extra.INPUT_ID"; diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 7089c0074c763..2703b1ae13e8b 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -266,6 +266,14 @@ public final class TvInputManager { public static final String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.metadata.CONTENT_RATING_SYSTEMS"; + /** + * Activity action to set up channel sources i.e. TV inputs of type + * {@link TvInputInfo#TYPE_TUNER}. When invoked, the system will display an appropriate UI for + * the user to initiate the individual setup flow provided by + * {@link android.R.attr#setupActivity} of each TV input service. + */ + public static final String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS"; + private final ITvInputManager mService; private final Object mLock = new Object();