Docs: Adding new diagram images
Adding new images for TV and HAL components. Minor edits to adjust image float/flow.
Adding new images for DRM. Minor edits to correct orphans.
Adding changes to audio diagram
Bug: 18947698
Change-Id: I7bf808fc0bbd99a8fa77f333f933a88a4942bf80
diff --git a/src/devices/audio/index.jd b/src/devices/audio/index.jd
index c42bca7..d3868d3 100644
--- a/src/devices/audio/index.jd
+++ b/src/devices/audio/index.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2014 The Android Open Source Project
+ Copyright 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,17 +16,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>In this document</h2>
+ <ol id="auto-toc">
+ </ol>
+ </div>
+</div>
+
+<img style="float: right; margin: 0px 15px 15px 0px;" src="images/ape_fwk_hal_audio.png" alt="Android Audio HAL icon" width="175" />
<p>
Android's audio Hardware Abstraction Layer (HAL) connects the higher-level, audio-specific
- framework APIs in <a href="http://developer.android.com/reference/android/media/package-summary.html">android.media</a>
- to the underlying audio driver and hardware.
+ framework APIs in <a href="http://developer.android.com/reference/android/media/package-summary.html">android.media</a> to the underlying audio driver and hardware. This section includes implementation instructions and tips for improving performance.</p>
</p>
-
+<h2 id="Architecture">Audio Architecture</h2>
<p>
The following figure and list describe how audio functionality is implemented and the relevant
source code that is involved in the implementation:
</p>
- <img src="images/audio_hal.png" alt="Audio architecture" id="figure1" />
+ <img src="images/ape_fwk_audio.png" alt="Audio architecture" id="figure1" />
<p class="img-caption">
<strong>Figure 1.</strong> Android audio architecture
</p>
@@ -100,9 +109,4 @@
<a href="https://developer.android.com/tools/sdk/ndk/index.html">Android NDK</a>,
and is at the same architecture level as
<a href="http://developer.android.com/reference/android/media/package-summary.html">android.media</a>.
-</p>
-
-<p>
- See the rest of the pages within the Audio section for implementation
- instructions and ways to improve performance.
-</p>
+</p>
\ No newline at end of file