diff options
| author | Scott Kennedy <skennedy@google.com> | 2015-03-07 01:34:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-07 01:34:49 +0000 |
| commit | 6c4c58d6d96a9118b1eea33c85e9494202d3e2e4 (patch) | |
| tree | d74dd3e56b48ccb6f0e0cecd735463e42010ad03 /core/java/android/widget/FrameLayout.java | |
| parent | 7830c81cd29a35476cae2543fd0e4c8dc3491194 (diff) | |
| parent | ed2b5f8aca703b3d54d11b8d9ba2519a32953e81 (diff) | |
| download | frameworks_base-6c4c58d6d96a9118b1eea33c85e9494202d3e2e4.zip frameworks_base-6c4c58d6d96a9118b1eea33c85e9494202d3e2e4.tar.gz frameworks_base-6c4c58d6d96a9118b1eea33c85e9494202d3e2e4.tar.bz2 | |
Merge "Add more @Nullable annotations"
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index e8dc11f..f6d198b 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -101,15 +101,16 @@ public class FrameLayout extends ViewGroup { super(context); } - public FrameLayout(Context context, AttributeSet attrs) { + public FrameLayout(Context context, @Nullable AttributeSet attrs) { this(context, attrs, 0); } - public FrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + public FrameLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { this(context, attrs, defStyleAttr, 0); } - public FrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + public FrameLayout( + Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); final TypedArray a = context.obtainStyledAttributes( |