diff options
| author | Philip Milne <pmilne@google.com> | 2011-06-16 19:02:33 -0700 |
|---|---|---|
| committer | Philip Milne <pmilne@google.com> | 2011-06-16 20:47:29 -0700 |
| commit | 1e54825135a7ccde421aa7fc400ab69e9348b5d6 (patch) | |
| tree | 1674637bfc90d9fb227164d47f885f350cf5ed9f /tests/GridLayoutTest | |
| parent | 4d4faf9e9119c186d96e0918fc9d6395188abd31 (diff) | |
| download | frameworks_base-1e54825135a7ccde421aa7fc400ab69e9348b5d6.zip frameworks_base-1e54825135a7ccde421aa7fc400ab69e9348b5d6.tar.gz frameworks_base-1e54825135a7ccde421aa7fc400ab69e9348b5d6.tar.bz2 | |
Change includeMarginsInAlignment flag to aligmentMode property.
Also:
. Change getInteger() to getInt().
. Conditionally compile, Paint() allocation and initialization.
. Correct spelling mistake in javadoc.
Change-Id: I00438a717e635a3917c5324f56063dce2e6041e8
Diffstat (limited to 'tests/GridLayoutTest')
| -rw-r--r-- | tests/GridLayoutTest/res/layout/grid3.xml | 2 | ||||
| -rw-r--r-- | tests/GridLayoutTest/src/com/android/test/layout/Activity2.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/GridLayoutTest/res/layout/grid3.xml b/tests/GridLayoutTest/res/layout/grid3.xml index 5cdacf7..ba911c2 100644 --- a/tests/GridLayoutTest/res/layout/grid3.xml +++ b/tests/GridLayoutTest/res/layout/grid3.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:useDefaultMargins="true" - android:marginsIncludedInAlignment="false" + android:alignmentMode="alignBounds" android:columnCount="4" > diff --git a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java index 32365d7..e010a00 100644 --- a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java +++ b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java @@ -36,7 +36,7 @@ public class Activity2 extends Activity { public static View create(Context context) { GridLayout vg = new GridLayout(context); vg.setUseDefaultMargins(true); - vg.setMarginsIncludedInAlignment(false); + vg.setAlignmentMode(ALIGN_BOUNDS); Group row1 = new Group(1, CENTER); Group row2 = new Group(2, CENTER); |