Merge "Allow attrs to be @Nullable in TextView and LinearLayout" (1592f989) · Commits · e / os / android_frameworks_base

core/java/android/widget/LinearLayout.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -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 = "";