diff options
| author | Filip Gruszczyński <gruszczy@google.com> | 2014-03-05 17:54:58 -0800 |
|---|---|---|
| committer | Filip Gruszczyński <gruszczy@google.com> | 2014-03-05 17:56:40 -0800 |
| commit | b50cea0267763d271df14a55859c6f203eeff041 (patch) | |
| tree | 12dc09b340a1f2be98d00457ede051ad1684dfe6 /core/java/android/view | |
| parent | cb20740ee171de3e604c07cdd02963d4d08a5fc9 (diff) | |
| parent | 1569d61f66431118666e51d55817193718d83206 (diff) | |
| download | frameworks_base-b50cea0267763d271df14a55859c6f203eeff041.zip frameworks_base-b50cea0267763d271df14a55859c6f203eeff041.tar.gz frameworks_base-b50cea0267763d271df14a55859c6f203eeff041.tar.bz2 | |
resolved conflicts for merge of 1569d61f to master
Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index de07b32..9c50323 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -515,7 +515,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager private void initFromAttributes( Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup); + final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup, defStyleAttr, + defStyleRes); final int N = a.getIndexCount(); for (int i = 0; i < N; i++) { |