From 48b55244d286b6d4e3699a5d9e938a9c87aaae75 Mon Sep 17 00:00:00 2001 From: Philip Milne Date: Wed, 29 Jun 2011 11:09:45 -0700 Subject: Support for maximum values in layout GridLayout. A cell's ability to shrink or stretch is now integrated with the constraints system, which is now supplied with both upper and lower bounds. Also: . Remove package private access (pseudo) annotation . Remove rowWeight and columnWeight attributes and fields . Remove code to handle weights Change-Id: I9e2432101d15466c621f51ae362435051fab5764 --- tests/GridLayoutTest/src/com/android/test/layout/Activity2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/GridLayoutTest/src/com/android/test/layout') diff --git a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java index e010a00..cba98c2 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.rowWeight = 1; - lp.columnWeight = 1; + lp.widthSpec = CAN_STRETCH; + lp.heightSpec = CAN_STRETCH; vg.addView(v, lp); } } -- cgit v1.1