summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-10-03 16:43:25 -0700
committerRicardo Cervera <rcervera@google.com>2014-10-03 16:43:25 -0700
commit3ffe146151a1332a39126949894b08c5412bfd50 (patch)
tree3c47761f8c010c10b87f79e85738fb4d11c5fbc8
parent2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881 (diff)
downloadframeworks_base-3ffe146151a1332a39126949894b08c5412bfd50.zip
frameworks_base-3ffe146151a1332a39126949894b08c5412bfd50.tar.gz
frameworks_base-3ffe146151a1332a39126949894b08c5412bfd50.tar.bz2
docs: Wear UI Lib training fixes
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
-rw-r--r--docs/html/training/wearables/ui/cards.jd6
-rw-r--r--docs/html/training/wearables/ui/exit.jd2
-rw-r--r--docs/html/training/wearables/ui/lists.jd3
3 files changed, 9 insertions, 2 deletions
diff --git a/docs/html/training/wearables/ui/cards.jd b/docs/html/training/wearables/ui/cards.jd
index 0633720..21f7e5c 100644
--- a/docs/html/training/wearables/ui/cards.jd
+++ b/docs/html/training/wearables/ui/cards.jd
@@ -167,3 +167,9 @@ protected void onCreate(Bundle savedInstanceState) {
cardScrollView.setCardGravity(Gravity.BOTTOM);
}
</pre>
+
+<p><code>CardScrollView</code> detects the shape of the screen and displays the card differently
+on round and square devices, using wider side margins on round screens. However,
+placing the <code>CardScrollView</code> element inside a <code>BoxInsetLayout</code> and using the
+<code>layout_box="bottom"</code> attribute is useful to align the card to the bottom of round
+screens without cropping its content.</p>
diff --git a/docs/html/training/wearables/ui/exit.jd b/docs/html/training/wearables/ui/exit.jd
index b89711a..84e1e45 100644
--- a/docs/html/training/wearables/ui/exit.jd
+++ b/docs/html/training/wearables/ui/exit.jd
@@ -28,7 +28,7 @@ the long-press-to-dismiss UI pattern to let users exit your app using the
You must also inform your users the first time they run your app that they can exit using
a long press.</p>
-<p>For design guidelines on exiting Android Wear activities, see
+<p>For design guidelines about exiting Android Wear activities, see
<a href="{@docRoot}design/wear/structure.html#Custom">Breaking out of the card</a>.</p>
diff --git a/docs/html/training/wearables/ui/lists.jd b/docs/html/training/wearables/ui/lists.jd
index 5458541..e8aaed4 100644
--- a/docs/html/training/wearables/ui/lists.jd
+++ b/docs/html/training/wearables/ui/lists.jd
@@ -172,8 +172,9 @@ specifies the layout parameters of each of the components inside a list item. Th
definition uses the custom layout implementation from the previous section and defines an icon
and a text view whose IDs match those in the layout implementation class:</p>
+<p class="code-caption">res/layout/list_item.xml</p>
+
<pre>
-&lt;-- res/layout/list_item.xml -->
&lt;com.example.android.support.wearable.notifications.WearableListItemLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center_vertical"