summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-13 23:12:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-13 23:12:44 +0000
commit7182f075fad7865eb8c1ce58d90327addabc7c4b (patch)
treef11bd44389641fd6e68207e86256cd3b5a1a6cdc
parent3430bec7e0b2f7a0552a66a523e478cd2ecd9043 (diff)
parent3ca7ad0bf14288b24d5b7a4762afa54ba5eb928c (diff)
downloadframeworks_base-7182f075fad7865eb8c1ce58d90327addabc7c4b.zip
frameworks_base-7182f075fad7865eb8c1ce58d90327addabc7c4b.tar.gz
frameworks_base-7182f075fad7865eb8c1ce58d90327addabc7c4b.tar.bz2
Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
-rw-r--r--docs/html/training/tv/start/layouts.jd16
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/html/training/tv/start/layouts.jd b/docs/html/training/tv/start/layouts.jd
index a378096..2b190b4 100644
--- a/docs/html/training/tv/start/layouts.jd
+++ b/docs/html/training/tv/start/layouts.jd
@@ -262,14 +262,16 @@ trainingnavtop=true
<h2 id="advertising">Provide Effective Advertising</h2>
-<p>Advertising on Android TV must always be full-screen. Ads must not appear alongside or over
-content. The user must be able to dismiss an advertisement with the D-pad controller. Video ads must
-be dismissible within 30 seconds of their start time.</p>
+<p>For the living room environment, we recommend you use video ads solutions
+that are full-screen and dismissable within 30 seconds. Functionality for
+advertising on Android TV, such as dismiss buttons and clickthroughs, must be
+accessible using the D-pad rather than touch.</p>
-<p>Android TV does not provide a web browser. Your ads must not attempt to launch a web browser or
-redirect to the Google Play Store.</p>
+<p>Android TV does not provide a web browser. Your ads must not attempt to
+launch a web browser or redirect to Google Play Store content that is not
+approved for Android TV devices.</p>
<p class="note">
- <strong>Note:</strong> You can use the {@link android.webkit.WebView} class for logins to
- services like Google+ and Facebook.
+ <strong>Note:</strong> You can use the {@link android.webkit.WebView} class
+ for logins to services like Google+ and Facebook.
</p> \ No newline at end of file