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

     * @param context The Context the view is running in, through which it can

     * @param context The Context the view is running in, through which it can

     *        access the current theme, resources, etc.

     *        access the current theme, resources, etc.

     * @param attrs The attributes of the XML tag that is inflating the view.

     * @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

     * @param defStyleAttr An attribute in the current theme that contains a

     *        will be applied (beyond what is included in the theme). This may

     *        reference to a style resource to apply to this view. If 0, no

     *        either be an attribute resource, whose value will be retrieved

     *        default style will be applied.

     *        from the current theme, or an explicit style resource.

     * @see #View(Context, AttributeSet)

     * @see #View(Context, AttributeSet)

     */

     */

    public View(Context context, AttributeSet attrs, int defStyle) {

    public View(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context);

        this(context);

        TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.View,

        TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.View,

                defStyle, 0);

                defStyleAttr, 0);

        Drawable background = null;

        Drawable background = null;