Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow attrs to be @Nullable in TextView and LinearLayout"

Browse Source
This commit is contained in:
Scott Kennedy
2015-03-06 18:45:23 +00:00
committed by Android (Google) Code Review
parent 97a351a329 3a1fa10e13
commit 1592f98973
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/LinearLayout.java
View File

@@ -19,6 +19,7 @@ package android.widget;
import com.android.internal.R;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -186,11 +187,11 @@ public class LinearLayout extends ViewGroup {
this(context, null);
}
public LinearLayout(Context context, AttributeSet attrs) {
public LinearLayout(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public LinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
public LinearLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}

7
core/java/android/widget/TextView.java
View File

@@ -637,16 +637,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
this(context, null);
}
public TextView(Context context, AttributeSet attrs) {
public TextView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, com.android.internal.R.attr.textViewStyle);
}
public TextView(Context context, AttributeSet attrs, int defStyleAttr) {
public TextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}
@SuppressWarnings("deprecation")
public TextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
public TextView(
Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
mText = "";