diff options
| author | Philip Milne <pmilne@google.com> | 2011-06-23 11:10:13 -0700 |
|---|---|---|
| committer | Philip Milne <pmilne@google.com> | 2011-06-23 11:41:57 -0700 |
| commit | a1f7b10f7299b40ee3a4e5e309882ea1a931cd5e (patch) | |
| tree | d65cd02933e7b17f75d19dd9483fa55abdc2dbfe /tests/GridLayoutTest | |
| parent | 0ff6d7ee17de33d314ef726e7506b39c64a3ed35 (diff) | |
| download | frameworks_base-a1f7b10f7299b40ee3a4e5e309882ea1a931cd5e.zip frameworks_base-a1f7b10f7299b40ee3a4e5e309882ea1a931cd5e.tar.gz frameworks_base-a1f7b10f7299b40ee3a4e5e309882ea1a931cd5e.tar.bz2 | |
Handle baseline aligned rows in which some components define baseline and some don't.
Also:
. Make all of the methods in Alignment package private.
. Inlucde Tor's test case
Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
Diffstat (limited to 'tests/GridLayoutTest')
| -rw-r--r-- | tests/GridLayoutTest/res/layout/grid7.xml | 68 |
1 files changed, 19 insertions, 49 deletions
diff --git a/tests/GridLayoutTest/res/layout/grid7.xml b/tests/GridLayoutTest/res/layout/grid7.xml index b97a00b..b9e58d7 100644 --- a/tests/GridLayoutTest/res/layout/grid7.xml +++ b/tests/GridLayoutTest/res/layout/grid7.xml @@ -15,56 +15,26 @@ <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="flabe" /> - - <Button android:id="@+id/initialActivity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="bax" /> - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="5dip" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="bar" /> - - <EditText android:id="@+id/numberOfEvents" - android:layout_marginLeft="2dip" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@android:drawable/editbox_background" - android:numeric="integer" - android:scrollHorizontally="true" - android:maxLines="1" /> - </LinearLayout> - - <Button android:id="@+id/start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:text="Foo" /> + android:layout_height="match_parent"> + android:columnCount="2" + <Space + android:layout_row="0" + android:layout_column="0" + android:layout_width="109dip" + android:layout_height="108dip"/> + + <Button + android:text="Button 1" + android:layout_row="0" + android:layout_column="1" + /> + + <Button + android:text="Button 2" + android:layout_row="1" + android:layout_column="1" + /> </GridLayout> |