diff options
| author | David Friedman <dmail@google.com> | 2014-12-12 04:23:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-12 04:23:07 +0000 |
| commit | 99385aa9928b1e860b0baefa73374018809c94ad (patch) | |
| tree | 3b61815015c8a30dfe694359b5a0d44c43361ea5 /docs | |
| parent | 3ead4127ae493508d064e106ec12f299e7116e8a (diff) | |
| parent | e90a170f67f91d9b0166ac4f0de07f63207b1bce (diff) | |
| download | frameworks_base-99385aa9928b1e860b0baefa73374018809c94ad.zip frameworks_base-99385aa9928b1e860b0baefa73374018809c94ad.tar.gz frameworks_base-99385aa9928b1e860b0baefa73374018809c94ad.tar.bz2 | |
am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
automerge: e90a170
* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
Adds link to related video.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/about/versions/android-5.0-changes.jd | 14 |
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 f54cde4..3de5c3c 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"> @@ -23,6 +24,13 @@ sdk.platform.apiLevel=21 <li><a href="#managed_profiles">Support for Managed Profiles</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 »</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> |