summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-07-09 14:13:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-09 14:13:54 -0700
commit1ab2edbcff94d53856a87010e35ffa50ce4c0502 (patch)
tree90b628a7449b984e2224eb0f32f1300853c0aaaf
parent15796e52df1626ae27a6a88c6e905fd3b80868c9 (diff)
parent74d762a3ee7dd66fe9ce44f3232159811af8d5d8 (diff)
downloadframeworks_base-1ab2edbcff94d53856a87010e35ffa50ce4c0502.zip
frameworks_base-1ab2edbcff94d53856a87010e35ffa50ce4c0502.tar.gz
frameworks_base-1ab2edbcff94d53856a87010e35ffa50ce4c0502.tar.bz2
Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev
-rw-r--r--core/java/android/app/MediaRouteButton.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
index c34c163..b0bfe74 100644
--- a/core/java/android/app/MediaRouteButton.java
+++ b/core/java/android/app/MediaRouteButton.java
@@ -60,7 +60,7 @@ public class MediaRouteButton extends View {
}
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) {