summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-13 23:58:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:58:09 +0000
commitfd186d20c53e8b0565f1360a71618710631eceeb (patch)
treef356d1caefeb8e1d6731bd310209fba91896ac77 /docs
parent0b403ebd6aecdf6691c4df009c791096d734aeb0 (diff)
parent28006a3b31d1cd3765568ceed211f8bc8de9c50c (diff)
downloadframeworks_base-fd186d20c53e8b0565f1360a71618710631eceeb.zip
frameworks_base-fd186d20c53e8b0565f1360a71618710631eceeb.tar.gz
frameworks_base-fd186d20c53e8b0565f1360a71618710631eceeb.tar.bz2
am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '28006a3b31d1cd3765568ceed211f8bc8de9c50c': docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Diffstat (limited to '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