diff options
| author | Philip Milne <pmilne@google.com> | 2011-07-07 11:47:08 -0700 |
|---|---|---|
| committer | Philip Milne <pmilne@google.com> | 2011-07-07 14:23:00 -0700 |
| commit | 5d1a9840aaf57ae90716f0ac34abdcd09f7f4ed6 (patch) | |
| tree | 4f55bb8da795bf4dc18377d69b2e61071211d9aa /tests/GridLayoutTest | |
| parent | b75a798471342da5e4624048c5516773dfecf4ca (diff) | |
| download | frameworks_base-5d1a9840aaf57ae90716f0ac34abdcd09f7f4ed6.zip frameworks_base-5d1a9840aaf57ae90716f0ac34abdcd09f7f4ed6.tar.gz frameworks_base-5d1a9840aaf57ae90716f0ac34abdcd09f7f4ed6.tar.bz2 | |
Simplify and tidy the API for maximum value support.
Also:
. Remove CAN_SHRINK, FIXED from public view. These can be added later.
Change-Id: I63a64ac4748605da60373c8e3c2109178b5260c2
Diffstat (limited to 'tests/GridLayoutTest')
| -rw-r--r-- | tests/GridLayoutTest/res/layout/grid3.xml | 4 | ||||
| -rw-r--r-- | tests/GridLayoutTest/src/com/android/test/layout/Activity2.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/GridLayoutTest/res/layout/grid3.xml b/tests/GridLayoutTest/res/layout/grid3.xml index 536be7e..3c2db54 100644 --- a/tests/GridLayoutTest/res/layout/grid3.xml +++ b/tests/GridLayoutTest/res/layout/grid3.xml @@ -66,8 +66,8 @@ <Space android:layout_row="4" android:layout_column="2" - android:layout_heightSpec="canStretch" - android:layout_widthSpec="canStretch" + android:layout_rowFlexibility="canStretch" + android:layout_columnFlexibility="canStretch" /> <Button diff --git a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java index cba98c2..b9bf526 100644 --- a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java +++ b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java @@ -97,8 +97,8 @@ public class Activity2 extends Activity { Space v = new Space(context); { LayoutParams lp = new LayoutParams(row5, col3); - lp.widthSpec = CAN_STRETCH; - lp.heightSpec = CAN_STRETCH; + lp.columnGroup.flexibility = CAN_STRETCH; + lp.rowGroup.flexibility = CAN_STRETCH; vg.addView(v, lp); } } |