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

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

Browse Source 
* commit 'b432ca60c6c7af42989db28594137f6fe1e888b4':
  Fix documentation regarding defStyle in View constructor
This commit is contained in:
Alan Viverette
2013-08-28 18:17:31 -07:00
committed by Android Git Automerger
parent 0d669d6d67 b432ca60c6
commit de16f5f605
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/View.java
View File

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