diff options
author | Jim Miller <jaggies@google.com> | 2011-06-16 18:32:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-16 18:32:44 -0700 |
commit | 452eec33d667f9e705b57e60948b070536fbc1b4 (patch) | |
tree | 90b406004cc453f019d726617ec666c1c1b69cac /core/java/android | |
parent | 05c06de73c593352fcef168f7b35fcdde3a7deae (diff) | |
parent | c655ba5e467090eb4f839f148ac31b50c389ffb2 (diff) | |
download | frameworks_base-452eec33d667f9e705b57e60948b070536fbc1b4.zip frameworks_base-452eec33d667f9e705b57e60948b070536fbc1b4.tar.gz frameworks_base-452eec33d667f9e705b57e60948b070536fbc1b4.tar.bz2 |
Merge "Update GridLayout constructors to properly handle DEBUG=true"
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/widget/GridLayout.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index 544bc6b..e54c511 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -189,10 +189,7 @@ public class GridLayout extends ViewGroup { * {@inheritDoc} */ public GridLayout(Context context) { - super(context); - if (DEBUG) { - setWillNotDraw(false); - } + this(context, null, 0); } /** @@ -200,6 +197,9 @@ public class GridLayout extends ViewGroup { */ public GridLayout(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + if (DEBUG) { + setWillNotDraw(false); + } processAttributes(context, attrs); } @@ -207,8 +207,7 @@ public class GridLayout extends ViewGroup { * {@inheritDoc} */ public GridLayout(Context context, AttributeSet attrs) { - super(context, attrs); - processAttributes(context, attrs); + this(context, attrs, 0); } private void processAttributes(Context context, AttributeSet attrs) { @@ -2287,4 +2286,4 @@ public class GridLayout extends ViewGroup { return cellSize; } }; -}
\ No newline at end of file +} |