diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd index 31f9b9ca4ead6..cc536517ea09c 100644 --- a/docs/html/guide/topics/ui/layout/grid.jd +++ b/docs/html/guide/topics/ui/layout/grid.jd @@ -23,17 +23,32 @@ displays child {@link android.view.View} elements in rows and columns.

-

{@link android.widget.TableLayout} positions its children into rows - and columns. TableLayout containers do not display border lines for their rows, columns, - or cells. The table will have as many columns as the row with the most cells. A table can leave -cells empty, but cells cannot span columns, as they can in HTML.

-

{@link android.widget.TableRow} objects are the child views of a TableLayout -(each TableRow defines a single row in the table). -Each row has zero or more cells, each of which is defined by any kind of other View. So, the cells of a row may be -composed of a variety of View objects, like ImageView or TextView objects. -A cell may also be a ViewGroup object (for example, you can nest another TableLayout as a cell).

-

The following sample layout has two rows and two cells in each. The accompanying screenshot shows the -result, with cell borders displayed as dotted lines (added for visual effect).

+

+ {@link android.widget.TableLayout} positions its children into rows and + columns. TableLayout containers do not display border lines for their rows, + columns, or cells. The table will have as many columns as the row with the + most cells. A table can leave cells empty. Cells can span multiple columns, + as they can in HTML. You can span columns by using the span + field in the {@link android.widget.TableRow.LayoutParams} class. +

+ +

+ Note: Cells cannot span multiple rows. +

+ +

+ {@link android.widget.TableRow} objects are the child views of a TableLayout + (each TableRow defines a single row in the table). Each row has zero or more + cells, each of which is defined by any kind of other View. So, the cells of + a row may be composed of a variety of View objects, like ImageView or + TextView objects. A cell may also be a ViewGroup object (for example, you + can nest another TableLayout as a cell). +

+

+ The following sample layout has two rows and two cells in each. The + accompanying screenshot shows the result, with cell borders displayed as + dotted lines (added for visual effect). +