Merge "add HCE dev guide" into klp-dev
diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
index 31544b0..c1213b6 100644
--- a/docs/html/samples/index.jd
+++ b/docs/html/samples/index.jd
@@ -15,25 +15,31 @@
<p>If you want to download a complete project, just click on any source file in the project and
click the link in the upper right of the source page.</p>
+<p>To import a downloaded project:<p>
+
+<div class="toggle-content closed">
+<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
+ <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
+ />Using Android Studio</a></p>
+
+ <div class="toggle-content-toggleme">
+
+ <ol>
+ <li>Unpack the downloaded project package.</li>
+ <li>In <a href="{@docRoot}sdk/installing/studio.html">Android Studio</a>, chose
+ <strong>File > Import Project</strong> and select the root folder of the unpacked project.
+ <p>Android Studio may ask you to choose the type of project you are importing.
+ If this is the case, make sure to choose <strong>Import project from
+ external model</strong> and select the <strong>Gradle</strong> option.
+ </p>
+ </li>
+ </ol>
+
+ </div>
+</div>
+
<p class="note">
<strong>Note:</strong> At this time, the downloadable projects are designed for use with Gradle
and Android Studio. Project downloads for Eclipse will be available soon!
</p>
-<p>To import a downloaded project into <a href="{@docRoot}sdk/installing/studio.html">Android
- Studio</a>:</p>
-
-<ul>
- <li>Unpack the downloaded project package.</li>
- <li>In Android Studio, chose <strong>File > Import Project</strong> and select root folder of
- the unpacked project.
- <p>Android Studio may ask you to choose the type of project you are importing.
- If this is the case, make sure to choose <strong>Import project from
- external model</strong> and the <strong>Gradle</strong> option.
- </p>
- </li>
-</ul>
-
-
-<div id="samples">
-</div>
diff --git a/graphics/java/android/graphics/pdf/PdfDocument.java b/graphics/java/android/graphics/pdf/PdfDocument.java
index 066ae2b..81e523d 100644
--- a/graphics/java/android/graphics/pdf/PdfDocument.java
+++ b/graphics/java/android/graphics/pdf/PdfDocument.java
@@ -391,6 +391,31 @@
/**
* Gets the {@link Canvas} of the page.
*
+ * <p>
+ * <strong>Note: </strong> There are some draw operations that are
+ * not yet supported by the canvas returned by this method. More
+ * specifically:
+ * <ul>
+ * <li>{@link Canvas#clipPath(android.graphics.Path)
+ * Canvas.clipPath(android.graphics.Path)}</li>
+ * <li>All flavors of {@link Canvas#drawText(String, float, float,
+ * android.graphics.Paint) Canvas.drawText(String, float, float,
+ * android.graphics.Paint)}</li>
+ * <li>All flavors of {@link Canvas#drawPosText(String, float[],
+ * android.graphics.Paint) Canvas.drawPosText(String, float[],
+ * android.graphics.Paint)}</li>
+ * <li>{@link Canvas#drawVertices(android.graphics.Canvas.VertexMode, int,
+ * float[], int, float[], int, int[], int, short[], int, int,
+ * android.graphics.Paint) Canvas.drawVertices(
+ * android.graphics.Canvas.VertexMode, int, float[], int, float[],
+ * int, int[], int, short[], int, int, android.graphics.Paint)}</li>
+ * <li>{@link android.graphics.PorterDuff.Mode#SRC_ATOP PorterDuff.Mode SRC},
+ * {@link android.graphics.PorterDuff.Mode#DST_ATOP PorterDuff.DST_ATOP},
+ * {@link android.graphics.PorterDuff.Mode#XOR PorterDuff.XOR},
+ * {@link android.graphics.PorterDuff.Mode#ADD PorterDuff.ADD}</li>
+ * <li>Perspective transforms</li>
+ * </ul>
+ *
* @return The canvas if the page is not finished, null otherwise.
*
* @see PdfDocument#finishPage(Page)
diff --git a/services/java/com/android/server/print/PrintManagerService.java b/services/java/com/android/server/print/PrintManagerService.java
index 8a3997a..98acc27 100644
--- a/services/java/com/android/server/print/PrintManagerService.java
+++ b/services/java/com/android/server/print/PrintManagerService.java
@@ -366,7 +366,7 @@
pw.println("PRINT MANAGER STATE (dumpsys print)");
final int userStateCount = mUserStates.size();
for (int i = 0; i < userStateCount; i++) {
- UserState userState = mUserStates.get(i);
+ UserState userState = mUserStates.valueAt(i);
userState.dump(fd, pw, "");
pw.println();
}