Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8c7737 authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android Git Automerger
Browse files

am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the... 

am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'affe4732':
  docs: Layout fixes for the Custom UI on Wear class
parents 5c1459f5 affe4732

docs/html/training/wearables/ui/confirm.jd

+4 −5
Original line number Diff line number Diff line
@@ -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>

docs/html/training/wearables/ui/layouts.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>

docs/html/training/wearables/ui/lists.jd

+2 −2
Original line number Diff line number Diff line
@@ -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>