Rename attribute dotRadius to avoid conflicts with wear
Test: with SupportLeanbackDemo app
Bug: 30104998
Change-Id: I80f191416b260da4c33e93803977d0ecb8ba3d92
diff --git a/v17/leanback/res/values/attrs.xml b/v17/leanback/res/values/attrs.xml
index 0069ec8..0e97f76 100644
--- a/v17/leanback/res/values/attrs.xml
+++ b/v17/leanback/res/values/attrs.xml
@@ -555,7 +555,7 @@
<declare-styleable name="PagingIndicator">
<!-- Attributes for the radius of the dot. -->
- <attr name="dotRadius" format="reference" />
+ <attr name="lbDotRadius" format="reference" />
<!-- Attributes for the radius of the arrow. -->
<attr name="arrowRadius" format="reference" />
<!-- Attributes for the distance between the centers of the adjacent dots. -->
diff --git a/v17/leanback/res/values/styles.xml b/v17/leanback/res/values/styles.xml
index 59bf520..0666cdd 100644
--- a/v17/leanback/res/values/styles.xml
+++ b/v17/leanback/res/values/styles.xml
@@ -731,7 +731,7 @@
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:focusable">true</item>
<item name="android:contentDescription">@string/lb_onboarding_accessibility_next</item>
- <item name="dotRadius">@dimen/lb_page_indicator_dot_radius</item>
+ <item name="lbDotRadius">@dimen/lb_page_indicator_dot_radius</item>
<item name="arrowRadius">@dimen/lb_page_indicator_arrow_radius</item>
<item name="dotToDotGap">@dimen/lb_page_indicator_dot_gap</item>
<item name="dotToArrowGap">@dimen/lb_page_indicator_arrow_gap</item>
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/PagingIndicator.java b/v17/leanback/src/android/support/v17/leanback/widget/PagingIndicator.java
index 10f2f82..78afa37 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/PagingIndicator.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/PagingIndicator.java
@@ -139,7 +139,7 @@
Resources res = getResources();
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.PagingIndicator,
defStyle, 0);
- mDotRadius = getDimensionFromTypedArray(typedArray, R.styleable.PagingIndicator_dotRadius,
+ mDotRadius = getDimensionFromTypedArray(typedArray, R.styleable.PagingIndicator_lbDotRadius,
R.dimen.lb_page_indicator_dot_radius);
mDotDiameter = mDotRadius * 2;
mArrowRadius = getDimensionFromTypedArray(typedArray,
