summaryrefslogtreecommitdiffstats
path: root/docs/html/about
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2014-12-10 11:14:01 -0800
committerDavid Friedman <dmail@google.com>2014-12-10 11:14:01 -0800
commit65a01238fc68b70a111d57001cbc8b7c022ece88 (patch)
tree2db69b71c4cbe651c93baca53b6b46ae3fc8f2fb /docs/html/about
parent09e72628fc9e58659c18b1bbbb1a0ec8a5878221 (diff)
downloadframeworks_base-65a01238fc68b70a111d57001cbc8b7c022ece88.zip
frameworks_base-65a01238fc68b70a111d57001cbc8b7c022ece88.tar.gz
frameworks_base-65a01238fc68b70a111d57001cbc8b7c022ece88.tar.bz2
Adds link to related video.
Change-Id: I22823b0df2863c4e733d389d20440debb16c5631
Diffstat (limited to 'docs/html/about')
-rw-r--r--docs/html/about/versions/android-5.0-changes.jd14
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/html/about/versions/android-5.0-changes.jd b/docs/html/about/versions/android-5.0-changes.jd
index f12e83c..0154750 100644
--- a/docs/html/about/versions/android-5.0-changes.jd
+++ b/docs/html/about/versions/android-5.0-changes.jd
@@ -4,6 +4,7 @@ sdk.platform.version=5.0
sdk.platform.apiLevel=21
@jd:body
+<!-- video box -->
<div id="qv-wrapper">
<div id="qv">
@@ -22,6 +23,13 @@ sdk.platform.apiLevel=21
<li><a href="#ssl">TLS/SSL Configuration</a></li>
</ol>
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
+<div>
+ <h3>Video</h3>
+ <p>Notifications</p>
+</div>
+</a>
+
<h2>API Differences</h2>
<ol>
<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>
@@ -296,8 +304,8 @@ methods respectively.</li>
<p>
Android 5.0 includes a behavior change to ensure
- that only one app can define a given custom permission, unless signed with the
- same key as other apps defining the permission.
+ that only one app can define a given custom permission, unless signed with the
+ same key as other apps defining the permission.
</p>
<h3>
@@ -316,7 +324,7 @@ methods respectively.</li>
<p>
In Android 4.4 and earlier, users were able to install multiple such
apps on a given device, although the system assigned the protection level
- specified by the first-installed app.
+ specified by the first-installed app.
</p>
<p>