Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev

Browse Source 
* commit '152440c67acace16dc1655a821352b0d69a61562':
  new device family image for design, not photos
This commit is contained in:
smain@google.com
2014-06-26 15:55:32 +00:00
committed by Android Git Automerger
parent 6988c162a3 152440c67a
commit 1fff0b321c
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/design/devices.jd
View File

@@ -13,7 +13,7 @@ footer.hide=1
#text-overlay {
position: absolute;
left: 0;
top: 410px;
top: 380px;
width: 340px;
}

BIN
docs/html/design/media/device_family.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 503 KiB

After

Width:  |  Height:  |  Size: 24 KiB

5
docs/html/design/wear/structure.jd
View File

@@ -97,9 +97,6 @@ page.title=App Structure for Android Wear
<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 @@ page.title=App Structure for Android Wear
</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>