summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2015-06-18 13:45:35 -0700
committerJae Seo <jaeseo@google.com>2015-06-19 15:04:28 -0700
commit81c754a54a6e06541d5410a3a965e5a5b84cf33f (patch)
tree04a5b8bd9aec9f6bf6757079062de4575a76666d /api
parent92dfab8d96dc854b8ccc48e1b2805069997879d5 (diff)
downloadframeworks_base-81c754a54a6e06541d5410a3a965e5a5b84cf33f.zip
frameworks_base-81c754a54a6e06541d5410a3a965e5a5b84cf33f.tar.gz
frameworks_base-81c754a54a6e06541d5410a3a965e5a5b84cf33f.tar.bz2
TIF: Add the columns for the app-linking to TvContract.Channels
The app-linking allows channel input sources to provide activity links from their live channel programming to another activity. This enables content providers to increase user engagement by offering the viewer other content or actions. Bug: 21884742 Change-Id: Iabeea57884c63ac31ee164c27c6e2fe1860f15f6
Diffstat (limited to 'api')
-rw-r--r--api/current.txt5
-rw-r--r--api/system-current.txt5
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a0dccd5..12088db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17698,6 +17698,11 @@ package android.media.tv {
public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
method public static final java.lang.String getVideoResolution(java.lang.String);
+ field public static final java.lang.String COLUMN_APP_LINK_COLOR = "app_link_color";
+ field public static final java.lang.String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";
field public static final java.lang.String COLUMN_DESCRIPTION = "description";
field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
diff --git a/api/system-current.txt b/api/system-current.txt
index 7e3e051..9e9e5df 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19035,6 +19035,11 @@ package android.media.tv {
public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
method public static final java.lang.String getVideoResolution(java.lang.String);
+ field public static final java.lang.String COLUMN_APP_LINK_COLOR = "app_link_color";
+ field public static final java.lang.String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
field public static final java.lang.String COLUMN_DESCRIPTION = "description";
field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";