am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs (31622894) · Commits · e / os / android_frameworks_base

docs/html/about/versions/android-5.0-changes.jd

+14 −7

Original line number	Diff line number	Diff line
		@@ -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

+8 −0

Original line number	Diff line number	Diff line
		@@ -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