diff options
| author | 2014-10-08 14:45:59 +0000 | |
|---|---|---|
| committer | 2014-10-08 14:45:59 +0000 | |
| commit | 59c04ece5614ffa20e10964a70c5faeafe565aa3 (patch) | |
| tree | 5e4bbf7df39aeb7725b563827c0bd737f006ce2a | |
| parent | 11b14e3996d3602155d6a61afb286e5bc0941a1f (diff) | |
| parent | bcd1af39fa674dcc46ddb30778304eaf67100a13 (diff) | |
am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
* commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13':
docs: Wear UI Lib training fixes
| -rw-r--r-- | docs/html/training/wearables/ui/cards.jd | 6 | ||||
| -rw-r--r-- | docs/html/training/wearables/ui/exit.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/wearables/ui/lists.jd | 3 |
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 0633720f7759..21f7e5c81e10 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 b89711a21ca5..84e1e45c9bd1 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 54585411c024..e8aaed4e5eb9 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> -<-- res/layout/list_item.xml --> <com.example.android.support.wearable.notifications.WearableListItemLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" |