diff options
| author | Shanea King-Roberson <kingroberson@google.com> | 2015-02-10 20:17:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 20:17:53 +0000 |
| commit | 696b68c4fc65b671a00cfa82e6bc29a7d665828e (patch) | |
| tree | b569ffa18a722160cad65f6677e52146d1389768 | |
| parent | 510c24e8930447811f6725cbf7f3cefec2194a5d (diff) | |
| parent | 24513bc580024a8a90c1ceab6746c0abb452d678 (diff) | |
| download | frameworks_base-696b68c4fc65b671a00cfa82e6bc29a7d665828e.zip frameworks_base-696b68c4fc65b671a00cfa82e6bc29a7d665828e.tar.gz frameworks_base-696b68c4fc65b671a00cfa82e6bc29a7d665828e.tar.bz2 | |
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
| -rw-r--r-- | docs/html/about/versions/android-5.0-changes.jd | 21 | ||||
| -rw-r--r-- | docs/html/training/wearables/watch-faces/index.jd | 8 |
2 files changed, 22 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 »</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 diff --git a/docs/html/training/wearables/watch-faces/index.jd b/docs/html/training/wearables/watch-faces/index.jd index c7affd1..453c30e 100644 --- a/docs/html/training/wearables/watch-faces/index.jd +++ b/docs/html/training/wearables/watch-faces/index.jd @@ -21,6 +21,14 @@ page.title=Creating Watch Faces </div> </a> +<a class="notice-developers-video wide" + href="https://www.youtube.com/watch?v=AK38PJZmIW8"> +<div> + <h3>Video</h3> + <p>DevBytes: Watch Faces for Android Wear</p> +</div> +</a> + <p>Watch faces in Android Wear leverage a dynamic digital canvas to tell time using colors, animations, and relevant contextual information. The <a href="https://play.google.com/store/apps/details?id=com.google.android.wearable.app">Android |