am 0a276b94: Merge "docs: Added L API overview." into lmp-dev

* commit '0a276b9448d907822bee1c3009608694fc480fcc': docs: Added L API overview.
2014-10-15 23:41:23 +00:00
parent 41d5d14df2 0a276b9448
commit 073c80d346
41 changed files with 1198 additions and 2 deletions
--- a/docs/html/about/about_toc.cs
+++ b/docs/html/about/about_toc.cs
@@ -1,11 +1,18 @@
 <ul id="nav">
-  
+
 <li class="nav-section">
    <div class="nav-section-header"><a href="<?cs var:toroot?>about/index.html">Welcome</a></div>
    <ul>
      <li><a href="<?cs var:toroot?>about/start.html">Get Started</a></li>
    </ul>
-  </li> 
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/android-5.0.html">
+      <span class="en">Lollipop</span></a></div>
+      <ul>
+        <li><a href="<?cs var:toroot ?>about/versions/android-5.0.html">Android 5.0 APIs</a></li>
+      </ul>
+  </li>
  <li class="nav-section">
    <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/kitkat.html">
      <span class="en">KitKat</span></a></div>
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
--- a/docs/html/images/android-5.0/ActivitySceneTransitionBasic.png
+++ b/docs/html/images/android-5.0/ActivitySceneTransitionBasic.png
--- a/docs/html/images/android-5.0/ActivitySceneTransitionBasic@2x.png
+++ b/docs/html/images/android-5.0/ActivitySceneTransitionBasic@2x.png
--- a/docs/html/images/android-5.0/BasicManagedProfile.png
+++ b/docs/html/images/android-5.0/BasicManagedProfile.png
--- a/docs/html/images/android-5.0/BasicManagedProfile@2x.png
+++ b/docs/html/images/android-5.0/BasicManagedProfile@2x.png
--- a/docs/html/images/android-5.0/JobSchedulerSample.png
+++ b/docs/html/images/android-5.0/JobSchedulerSample.png
--- a/docs/html/images/android-5.0/JobSchedulerSample@2x.png
+++ b/docs/html/images/android-5.0/JobSchedulerSample@2x.png
--- a/docs/html/images/android-5.0/art.png
+++ b/docs/html/images/android-5.0/art.png
--- a/docs/html/images/android-5.0/battery_historian.png
+++ b/docs/html/images/android-5.0/battery_historian.png
--- a/docs/html/images/android-5.0/battery_historian@2x.png
+++ b/docs/html/images/android-5.0/battery_historian@2x.png
--- a/docs/html/images/android-5.0/bugs.png
+++ b/docs/html/images/android-5.0/bugs.png
--- a/docs/html/images/android-5.0/hun-example.png
+++ b/docs/html/images/android-5.0/hun-example.png
--- a/docs/html/images/android-5.0/hun-example@2x.png
+++ b/docs/html/images/android-5.0/hun-example@2x.png
--- a/docs/html/images/android-5.0/l-dev-prev.png
+++ b/docs/html/images/android-5.0/l-dev-prev.png
--- a/docs/html/images/android-5.0/managed_apps_launcher.png
+++ b/docs/html/images/android-5.0/managed_apps_launcher.png
--- a/docs/html/images/android-5.0/managed_apps_launcher@2x.png
+++ b/docs/html/images/android-5.0/managed_apps_launcher@2x.png
--- a/docs/html/images/android-5.0/notifications/AntiSample1.png
+++ b/docs/html/images/android-5.0/notifications/AntiSample1.png
--- a/docs/html/images/android-5.0/notifications/AntiSample3.png
+++ b/docs/html/images/android-5.0/notifications/AntiSample3.png
--- a/docs/html/images/android-5.0/notifications/ExpandedImage.png
+++ b/docs/html/images/android-5.0/notifications/ExpandedImage.png
--- a/docs/html/images/android-5.0/notifications/Headsup.png
+++ b/docs/html/images/android-5.0/notifications/Headsup.png
--- a/docs/html/images/android-5.0/notifications/Largelogo.png
+++ b/docs/html/images/android-5.0/notifications/Largelogo.png
--- a/docs/html/images/android-5.0/notifications/LockScreen.png
+++ b/docs/html/images/android-5.0/notifications/LockScreen.png
--- a/docs/html/images/android-5.0/notifications/MusicPlayback.png
+++ b/docs/html/images/android-5.0/notifications/MusicPlayback.png
--- a/docs/html/images/android-5.0/notifications/ProductIcons.png
+++ b/docs/html/images/android-5.0/notifications/ProductIcons.png
--- a/docs/html/images/android-5.0/notifications/Productlogos.png
+++ b/docs/html/images/android-5.0/notifications/Productlogos.png
--- a/docs/html/images/android-5.0/notifications/ReplyAction.png
+++ b/docs/html/images/android-5.0/notifications/ReplyAction.png
--- a/docs/html/images/android-5.0/notifications/Stack.png
+++ b/docs/html/images/android-5.0/notifications/Stack.png
--- a/docs/html/images/android-5.0/notifications/Summarise_Do.png
+++ b/docs/html/images/android-5.0/notifications/Summarise_Do.png
--- a/docs/html/images/android-5.0/notifications/Summarise_Dont.png
+++ b/docs/html/images/android-5.0/notifications/Summarise_Dont.png
--- a/docs/html/images/android-5.0/notifications/Summary_Do.png
+++ b/docs/html/images/android-5.0/notifications/Summary_Do.png
--- a/docs/html/images/android-5.0/notifications/TimeSensitive.png
+++ b/docs/html/images/android-5.0/notifications/TimeSensitive.png
--- a/docs/html/images/android-5.0/notifications/Triggered.png
+++ b/docs/html/images/android-5.0/notifications/Triggered.png
--- a/docs/html/images/android-5.0/notifications/WearBasic.png
+++ b/docs/html/images/android-5.0/notifications/WearBasic.png
--- a/docs/html/images/android-5.0/notifications/action_combo.png
+++ b/docs/html/images/android-5.0/notifications/action_combo.png
--- a/docs/html/images/android-5.0/notifications/basic_combo.png
+++ b/docs/html/images/android-5.0/notifications/basic_combo.png
--- a/docs/html/images/android-5.0/notifications/expandedtext_combo.png
+++ b/docs/html/images/android-5.0/notifications/expandedtext_combo.png
--- a/docs/html/images/android-5.0/notifications/notifications_pattern_priority.png
+++ b/docs/html/images/android-5.0/notifications/notifications_pattern_priority.png
--- a/docs/html/images/android-5.0/notifications/stack_combo.png
+++ b/docs/html/images/android-5.0/notifications/stack_combo.png
--- a/docs/html/images/android-5.0/opt-in.png
+++ b/docs/html/images/android-5.0/opt-in.png
--- a/docs/html/images/android-5.0/updates.png
+++ b/docs/html/images/android-5.0/updates.png