summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ricardo Cervera <rcervera@google.com> 2014-12-02 19:13:54 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-02 19:13:54 +0000
commita107b5150b38a8c6585631b1773d6c10f682f42b (patch)
treea6778569e6b455c877617370718cdd7432d788f7
parent0ac703fc8f4569338acc823221089c62480f0d7c (diff)
parent64f49162460eaddf49f9d56c5dc6a01f472e790c (diff)
am 64f49162: docs: Layout fixes for the Custom UI on Wear class
* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c': docs: Layout fixes for the Custom UI on Wear class
-rw-r--r--docs/html/training/wearables/ui/confirm.jd9
-rw-r--r--docs/html/training/wearables/ui/layouts.jd2
-rw-r--r--docs/html/training/wearables/ui/lists.jd4
3 files changed, 7 insertions, 8 deletions
diff --git a/docs/html/training/wearables/ui/confirm.jd b/docs/html/training/wearables/ui/confirm.jd
index 36330a696e03..07a352f9239f 100644
--- a/docs/html/training/wearables/ui/confirm.jd
+++ b/docs/html/training/wearables/ui/confirm.jd
@@ -116,15 +116,14 @@ mDelayedView.setTotalTimeMs(2000);
mDelayedView.start();
</pre>
-
-<h2 id="show-confirmation">Show Confirmation Animations</h2>
-
-<div style="float:right;margin-left:25px;width:200px">
+<div style="float:right;margin-left:25px;width:210px;margin-top:15px">
<img src="{@docRoot}wear/images/08_uilib.png" width="200" height="200" alt=""/>
-<p class="img-caption" style="text-align:center"><strong>Figure 2:</strong>
+<p class="img-caption" style="text-align:center;margin-left:-5px"><strong>Figure 2:</strong>
A confirmation animation.</p>
</div>
+<h2 id="show-confirmation">Show Confirmation Animations</h2>
+
<p>To show a confirmation animation when users complete an action in your app, create an intent
that starts <code>ConfirmationActivity</code> from one of your activities. You can specify
one of the these animations with the <code>EXTRA_ANIMATION_TYPE</code> intent extra:</p>
diff --git a/docs/html/training/wearables/ui/layouts.jd b/docs/html/training/wearables/ui/layouts.jd
index 14b9403048f4..130f1c477f73 100644
--- a/docs/html/training/wearables/ui/layouts.jd
+++ b/docs/html/training/wearables/ui/layouts.jd
@@ -166,7 +166,7 @@ protected void onCreate(Bundle savedInstanceState) {
<h2 id="same-layout">Use a Shape-Aware Layout</h2>
-<div style="float:right;margin-left:25px;width:250px">
+<div style="float:right;margin-left:25px;width:260px">
<img src="{@docRoot}wear/images/02_uilib.png" width="250" height="250" alt=""/>
<p class="img-caption"><strong>Figure 2.</strong> Window insets on a round screen.</p>
</div>
diff --git a/docs/html/training/wearables/ui/lists.jd b/docs/html/training/wearables/ui/lists.jd
index e8aaed4e5eb9..1d6e8ed717d1 100644
--- a/docs/html/training/wearables/ui/lists.jd
+++ b/docs/html/training/wearables/ui/lists.jd
@@ -36,9 +36,9 @@ the <code>android-sdk/samples/android-20/wearable/Notifications</code> directory
<li>Add a <code>WearableListView</code> element to your activity's layout definition.</li>
<li>Create a custom layout implementation for your list items.</li>
<li>Use this implementation to create a layout definition file for your list items.</li>
-<div style="float:right;margin-left:25px;width:215px;margin-top:-20px">
+<div style="float:right;margin-left:25px;width:220px;margin-top:-25px">
<img src="{@docRoot}wear/images/06_uilib.png" width="200" height="200" alt=""/>
-<p class="img-caption" style="text-align:center"><strong>Figure 3:</strong>
+<p class="img-caption" style="text-align:center;margin-left:-10px"><strong>Figure 3:</strong>
A list view on Android Wear.</p>
</div>
<li>Create an adapter to populate the list.</li>