Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de16f5f6 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev

* commit 'b432ca60':
  Fix documentation regarding defStyle in View constructor
parents 0d669d6d b432ca60
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -3399,17 +3399,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     * @param context The Context the view is running in, through which it can
     *        access the current theme, resources, etc.
     * @param attrs The attributes of the XML tag that is inflating the view.
     * @param defStyle The default style to apply to this view. If 0, no style
     *        will be applied (beyond what is included in the theme). This may
     *        either be an attribute resource, whose value will be retrieved
     *        from the current theme, or an explicit style resource.
     * @param defStyleAttr An attribute in the current theme that contains a
     *        reference to a style resource to apply to this view. If 0, no
     *        default style will be applied.
     * @see #View(Context, AttributeSet)
     */
    public View(Context context, AttributeSet attrs, int defStyle) {
    public View(Context context, AttributeSet attrs, int defStyleAttr) {
        this(context);
        TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.View,
                defStyle, 0);
                defStyleAttr, 0);
        Drawable background = null;