Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev

adamp · Android (Google) Code Review · commit 1ab2edbcff94 · 2012-07-09T14:13:54.000-07:00
diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
@@ -60,7 +60,7 @@ public MediaRouteButton(Context context) {
     }
 
     public MediaRouteButton(Context context, AttributeSet attrs) {
-        this(context, null, com.android.internal.R.attr.mediaRouteButtonStyle);
+        this(context, attrs, com.android.internal.R.attr.mediaRouteButtonStyle);
     }
 
     public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public MediaRouteButton(Context context) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public MediaRouteButton(Context context, AttributeSet attrs) {`
`63`		`- this(context, null, com.android.internal.R.attr.mediaRouteButtonStyle);`
	`63`	`+ this(context, attrs, com.android.internal.R.attr.mediaRouteButtonStyle);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {`