Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs

Browse Source 
automerge: 696b68c

* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
  Adding videos for 5.0 changes and watch face development.
This commit is contained in:
Shanea King-Roberson
2015-02-10 20:25:34 +00:00
committed by android-build-merger
parent 449988872b 696b68c4fc
commit accf077030
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docs/html/about/versions/android-5.0-changes.jd
View File

@@ -24,13 +24,6 @@ sdk.platform.apiLevel=21
<li><a href="#managed_profiles">Support for Managed Profiles</a></li> <li><a href="#managed_profiles">Support for Managed Profiles</a></li>
</ol> </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> <h2>API Differences</h2>
<ol> <ol>
<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li> <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>
</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>API Level: {@sdkPlatformApiLevel}</p>
<p>Along with new features and capabilities, Android 5.0 includes a variety of <p>Along with new features and capabilities, Android 5.0 includes a variety of
system changes and API behavior changes. This document highlights system changes and API behavior changes. This document highlights

8
docs/html/training/wearables/watch-faces/index.jd
View File

@@ -21,6 +21,14 @@ page.title=Creating Watch Faces
</div> </div>
</a> </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, <p>Watch faces in Android Wear leverage a dynamic digital canvas to tell time using colors,
animations, and relevant contextual information. The <a animations, and relevant contextual information. The <a
href="https://play.google.com/store/apps/details?id=com.google.android.wearable.app">Android href="https://play.google.com/store/apps/details?id=com.google.android.wearable.app">Android