diff options
| -rw-r--r-- | core/java/android/widget/GridLayout.java | 12 | ||||
| -rw-r--r-- | tests/GridLayoutTest/res/layout/grid3.xml | 9 | ||||
| -rw-r--r-- | tests/GridLayoutTest/src/com/android/test/layout/Activity2.java | 16 |
3 files changed, 15 insertions, 22 deletions
diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index d9770295ae72..390002b6ba30 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -395,10 +395,6 @@ public class GridLayout extends ViewGroup { */ public void setUseDefaultMargins(boolean useDefaultMargins) { mUseDefaultMargins = useDefaultMargins; - if (useDefaultMargins) { - int padding = mDefaultGap; - setPadding(padding, padding, padding, padding); - } requestLayout(); } @@ -740,6 +736,10 @@ public class GridLayout extends ViewGroup { graphics.drawLine(dx + x1, dy + y1, dx + x2, dy + y2, paint); } + private static void drawRect(Canvas canvas, int x1, int y1, int x2, int y2, Paint paint) { + canvas.drawRect(x1, y1, x2 - 1, y2 - 1, paint); + } + @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); @@ -772,14 +772,14 @@ public class GridLayout extends ViewGroup { paint.setColor(Color.BLUE); for (int i = 0; i < getChildCount(); i++) { View c = getChildAt(i); - canvas.drawRect(c.getLeft(), c.getTop(), c.getRight(), c.getBottom(), paint); + drawRect(canvas, c.getLeft(), c.getTop(), c.getRight(), c.getBottom(), paint); } // Draw margins paint.setColor(Color.MAGENTA); for (int i = 0; i < getChildCount(); i++) { View c = getChildAt(i); - canvas.drawRect( + drawRect(canvas, c.getLeft() - getMargin1(c, true, true), c.getTop() - getMargin1(c, false, true), c.getRight() + getMargin1(c, true, false), diff --git a/tests/GridLayoutTest/res/layout/grid3.xml b/tests/GridLayoutTest/res/layout/grid3.xml index 2eca384be5ff..0e5361318532 100644 --- a/tests/GridLayoutTest/res/layout/grid3.xml +++ b/tests/GridLayoutTest/res/layout/grid3.xml @@ -22,6 +22,7 @@ android:useDefaultMargins="true" android:alignmentMode="alignBounds" + android:rowOrderPreserved="false" android:columnCount="4" > @@ -49,7 +50,7 @@ /> <EditText - android:layout_width="64dip" + android:ems="10" /> <TextView @@ -60,13 +61,13 @@ /> <EditText - android:layout_width="32dip" + android:ems="8" /> <Space - android:layout_row="4" + android:layout_row="2" + android:layout_rowSpan="3" android:layout_column="2" - android:layout_margin="0dip" android:layout_gravity="fill" /> diff --git a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java index 907ee9cadc9a..8974f374efeb 100644 --- a/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java +++ b/tests/GridLayoutTest/src/com/android/test/layout/Activity2.java @@ -38,7 +38,6 @@ public class Activity2 extends Activity { p.setUseDefaultMargins(true); p.setAlignmentMode(ALIGN_BOUNDS); p.setRowOrderPreserved(false); - p.setPadding(0, 0, 0, 0); Spec row1 = spec(0); Spec row2 = spec(1); @@ -75,12 +74,9 @@ public class Activity2 extends Activity { } { EditText c = new EditText(context); + c.setEms(10); c.setInputType(TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_EMAIL_ADDRESS); - { - LayoutParams lp = new LayoutParams(row3, col2); - lp.width = (int) c.getPaint().measureText("Frederick.W.Flintstone"); - p.addView(c, lp); - } + p.addView(c, new LayoutParams(row3, col2)); } { TextView c = new TextView(context); @@ -89,17 +85,13 @@ public class Activity2 extends Activity { } { TextView c = new EditText(context); + c.setEms(8); c.setInputType(TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_PASSWORD); - { - LayoutParams lp = new LayoutParams(row4, col2); - lp.width = (int) c.getPaint().measureText("************"); - p.addView(c, lp); - } + p.addView(c, new LayoutParams(row4, col2)); } { Space c = new Space(context); LayoutParams lp = new LayoutParams(row5, col3); - lp.setMargins(0, 0, 0, 0); p.addView(c, lp); } { |