diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-05 02:34:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-05 02:34:51 +0000 |
| commit | 08c72b91bedefbebe0547646544cd875c1062af0 (patch) | |
| tree | 0c6af2e5a87ec39061fec0db79f27e1dbe9643d1 /docs/html/design/patterns/selection.jd | |
| parent | 2f6261534b0916714715ffa9e2800716dd900eb8 (diff) | |
| parent | ecfed34d3e71bfceae11493b8441a051e803ec05 (diff) | |
| download | frameworks_base-08c72b91bedefbebe0547646544cd875c1062af0.zip frameworks_base-08c72b91bedefbebe0547646544cd875c1062af0.tar.gz frameworks_base-08c72b91bedefbebe0547646544cd875c1062af0.tar.bz2 | |
am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
* commit 'ecfed34d3e71bfceae11493b8441a051e803ec05':
Doc change: merge landing page and header/footer designs.
Diffstat (limited to 'docs/html/design/patterns/selection.jd')
| -rw-r--r-- | docs/html/design/patterns/selection.jd | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/html/design/patterns/selection.jd b/docs/html/design/patterns/selection.jd index 7ed6dcc..e00f726 100644 --- a/docs/html/design/patterns/selection.jd +++ b/docs/html/design/patterns/selection.jd @@ -23,8 +23,8 @@ handle multi-select and contextual actions in your apps.</p> <div class="vspace size-1"> </div> -<div class="layout-content-row"> - <div class="layout-content-col span-6"> +<div class="cols"> + <div class="col-6"> <h4>What has changed?</h4> <p>In previous versions of Android, the long press gesture was universally used to display contextual @@ -34,7 +34,7 @@ contextual actions and selection management functions for selected data into a n the contextual action bar (CAB).</p> </div> - <div class="layout-content-col span-7"> + <div class="col-7"> <img src="{@docRoot}design/media/selection_context_menu.png"> <div class="figure-caption"> @@ -52,8 +52,8 @@ is selected. It appears after the user long-presses on a selectable data item.</ <div class="vspace size-1"> </div> -<div class="layout-content-row"> - <div class="layout-content-col span-6"> +<div class="cols"> + <div class="col-6"> <p>From here the user can:</p> <ul> @@ -65,15 +65,15 @@ is selected. It appears after the user long-presses on a selectable data item.</ </ul> </div> - <div class="layout-content-col span-7"> + <div class="col-7"> <img src="{@docRoot}design/media/selection_cab_example.png"> </div> </div> -<div class="layout-content-row"> - <div class="layout-content-col span-6"> +<div class="cols"> + <div class="col-6"> <h4>Selecting CAB actions</h4> <p>You can decide which actions and elements appear in the CAB. Use the guidelines in the <a href="actionbar.html">Action Bar @@ -85,7 +85,7 @@ the selection. Actions that apply to a single selected data item don't necessari selected data items of the same kind.</p> </div> - <div class="layout-content-col span-7"> + <div class="col-7"> <img src="{@docRoot}design/media/selection_adjusting_actions.png"> <div class="figure-caption"> |