diff options
| author | smain@google.com <smain@google.com> | 2014-06-26 01:03:55 -0700 |
|---|---|---|
| committer | smain@google.com <smain@google.com> | 2014-06-26 01:08:36 -0700 |
| commit | 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232 (patch) | |
| tree | 995dd7825caf6eb5d9ad8a9ce0185066dd341da1 /docs | |
| parent | fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0 (diff) | |
| download | frameworks_base-9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.zip frameworks_base-9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.tar.gz frameworks_base-9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.tar.bz2 | |
new device family image for design, not photos
Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/design/devices.jd | 2 | ||||
| -rw-r--r-- | docs/html/design/media/device_family.png | bin | 514700 -> 24797 bytes | |||
| -rw-r--r-- | docs/html/design/wear/structure.jd | 5 |
3 files changed, 3 insertions, 4 deletions
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 @@ footer.hide=1 #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 Binary files differindex 96b31d3..c4863fc 100644 --- a/docs/html/design/media/device_family.png +++ b/docs/html/design/media/device_family.png 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 @@ 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> |
