Merge "Initial RDNSS tracking implementation."
diff --git a/Android.mk b/Android.mk
index efbee5e..bb65398 100644
--- a/Android.mk
+++ b/Android.mk
@@ -832,7 +832,6 @@
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \
-hdf android.whichdoc online \
- -briefdocs \
$(sample_groups) \
-hdf android.hasSamples true \
-samplesdir $(samples_dir)
diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp
index eb9068e..1d465b3 100644
--- a/core/jni/android/graphics/FontFamily.cpp
+++ b/core/jni/android/graphics/FontFamily.cpp
@@ -27,6 +27,7 @@
#include <androidfw/AssetManager.h>
#include "Utils.h"
+#include "TypefaceImpl.h"
#include <minikin/FontFamily.h>
#include "MinikinSkia.h"
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index ad174f7..7fda3d9 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -8,13 +8,16 @@
#include "SkPoint.h"
#include "SkRect.h"
#include "SkImageDecoder.h"
-#include "TypefaceImpl.h"
#include <jni.h>
class SkBitmapRegionDecoder;
class SkCanvas;
class SkPaint;
+namespace android {
+class TypefaceImpl;
+}
+
class GraphicsJNI {
public:
enum BitmapCreateFlags {
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index 7562090..0ad390a 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -39,6 +39,7 @@
#include <minikin/Layout.h>
#include "MinikinSkia.h"
#include "MinikinUtils.h"
+#include "TypefaceImpl.h"
// temporary for debugging
#include <Caches.h>
diff --git a/docs/html/design/devices.jd b/docs/html/design/devices.jd
index c67e585..9554e9b 100644
--- a/docs/html/design/devices.jd
+++ b/docs/html/design/devices.jd
@@ -13,7 +13,7 @@
#text-overlay {
position: absolute;
left: 0;
- top: 410px;
+ top: 380px;
width: 340px;
}
diff --git a/docs/html/design/media/device_family.png b/docs/html/design/media/device_family.png
index 96b31d3..c4863fc 100644
--- a/docs/html/design/media/device_family.png
+++ b/docs/html/design/media/device_family.png
Binary files differ
diff --git a/docs/html/design/wear/structure.jd b/docs/html/design/wear/structure.jd
index f5ed49d..67b218a 100644
--- a/docs/html/design/wear/structure.jd
+++ b/docs/html/design/wear/structure.jd
@@ -97,9 +97,6 @@
<h2 id="Custom">Breaking out of the card (with custom layouts)</h2>
-<p>There are some things you can’t do on a card. Swiping in many directions on a map or a joystick are a few examples. In those cases it might be good idea to momentarily go full screen.</p>
-
-
<a class="notice-developers" href="{@docRoot}training/wearables/apps/index.html">
<div>
<h3>Developer Docs</h3>
@@ -107,6 +104,8 @@
</div>
</a>
+<p>There are some things you can’t do on a card. Swiping in many directions on a map or a joystick are a few examples. In those cases it might be good idea to momentarily go full screen.</p>
+
<img src="{@docRoot}design/media/wear/customlayout.png" alt="" width="760px" />
<h3>When to go full screen</h3>
