Merge "new device family image for design, not photos" into klp-modular-dev
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>
