summaryrefslogtreecommitdiffstats
path: root/docs/html/about
diff options
context:
space:
mode:
authorEric Gilmore <egilmore@google.com>2015-02-10 10:29:36 -0800
committerEric Gilmore <egilmore@google.com>2015-02-10 10:29:36 -0800
commitd86211292eda0aa27e0b2f05214601279b193b3f (patch)
tree00e1be902d7a4a78ef87dcf746ddb49b6e1ec5a7 /docs/html/about
parentba20f98c88b754b3a69d55963275e20ab2fba6bf (diff)
downloadframeworks_base-d86211292eda0aa27e0b2f05214601279b193b3f.zip
frameworks_base-d86211292eda0aa27e0b2f05214601279b193b3f.tar.gz
frameworks_base-d86211292eda0aa27e0b2f05214601279b193b3f.tar.bz2
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos Changes to be committed: modified: docs/html/about/versions/android-5.0-changes.jd modified: docs/html/training/wearables/watch-faces/index.jd Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Diffstat (limited to 'docs/html/about')
-rw-r--r--docs/html/about/versions/android-5.0-changes.jd21
1 files changed, 14 insertions, 7 deletions
diff --git a/docs/html/about/versions/android-5.0-changes.jd b/docs/html/about/versions/android-5.0-changes.jd
index 3de5c3c..f51af40 100644
--- a/docs/html/about/versions/android-5.0-changes.jd
+++ b/docs/html/about/versions/android-5.0-changes.jd
@@ -24,13 +24,6 @@ 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 &raquo;</a> </li>
@@ -48,6 +41,20 @@ sdk.platform.apiLevel=21
</div>
</div>
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=um1S2u022HA">
+<div>
+ <h3>Video</h3>
+ <p>Dev Byte: What's New in Android 5.0</p>
+</div>
+</a>
+
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
+<div>
+ <h3>Video</h3>
+ <p>Dev Byte: Notifications</p>
+</div>
+</a>
+
<p>API Level: {@sdkPlatformApiLevel}</p>
<p>Along with new features and capabilities, Android 5.0 includes a variety of
system changes and API behavior changes. This document highlights