am aa6e143b: am 94756719: Mark attrs @Nullable in Toolbar constructors
* commit 'aa6e143ba85732f997933e0bc7c61ebd48ab64e2':
Mark attrs @Nullable in Toolbar constructors
diff --git a/v7/appcompat/src/android/support/v7/widget/Toolbar.java b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
index fd7b328..0d99a5f 100644
--- a/v7/appcompat/src/android/support/v7/widget/Toolbar.java
+++ b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
@@ -188,11 +188,11 @@
this(context, null);
}
- public Toolbar(Context context, AttributeSet attrs) {
+ public Toolbar(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, R.attr.toolbarStyle);
}
- public Toolbar(Context context, AttributeSet attrs, int defStyleAttr) {
+ public Toolbar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
// We manually themify the context here so that we don't break apps which only
// use app:theme when running on >= Lollipop
super(ViewUtils.themifyContext(context, attrs, false, true), attrs, defStyleAttr);