Added bright color parameter to search orb
b/15427416
Change-Id: I10c1d03db62b25d28cd573ff7fa7a491648a3ac9
diff --git a/v17/leanback/res/values/attrs.xml b/v17/leanback/res/values/attrs.xml
index ac15b15..6e08c8a 100644
--- a/v17/leanback/res/values/attrs.xml
+++ b/v17/leanback/res/values/attrs.xml
@@ -125,6 +125,8 @@
<attr name="searchOrbIcon" format="reference"/>
<!-- Defining color of the search affordance -->
<attr name="searchOrbColor" format="reference|color" />
+ <!-- Defining pulse color of the search affordance -->
+ <attr name="searchOrbBrightColor" format="reference|color" />
</declare-styleable>
<declare-styleable name="LeanbackTheme">
@@ -187,6 +189,8 @@
<!-- Default colors -->
<attr name="defaultBrandColor" format="reference|color" />
<attr name="defaultSearchColor" format="reference|color" />
+ <!-- Default color that search orb pulses to. If not set, this color is determined programatically based on the defaultSearchColor -->
+ <attr name="defaultSearchBrightColor" format="reference|color" />
<!-- Style for searchOrb -->
<attr name="searchOrbViewStyle" format="reference"/>
diff --git a/v17/leanback/res/values/styles.xml b/v17/leanback/res/values/styles.xml
index a57aa08..a3a0559 100644
--- a/v17/leanback/res/values/styles.xml
+++ b/v17/leanback/res/values/styles.xml
@@ -220,5 +220,6 @@
<style name="Widget.Leanback.SearchOrbViewStyle">
<item name="searchOrbIcon">?attr/defaultSearchIcon</item>
<item name="searchOrbColor">?attr/defaultSearchColor</item>
+ <item name="searchOrbBrightColor">?attr/defaultSearchBrightColor</item>
</style>
</resources>
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java b/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
index 94f94eb..ad92fbf 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
@@ -91,7 +91,9 @@
setOrbIcon(img);
int color = a.getColor(R.styleable.lbSearchOrbView_searchOrbColor, 0);
- setOrbColor(color);
+ int brightColor = a.getColor(
+ R.styleable.lbSearchOrbView_searchOrbBrightColor, getBrightColor(color));
+ setOrbColor(color, brightColor);
a.recycle();
setFocusable(true);
@@ -150,8 +152,12 @@
* @param color the RGBA color
*/
public void setOrbColor(int color) {
+ setOrbColor(color, getBrightColor(color));
+ }
+
+ public void setOrbColor(int color, int brightColor) {
mSearchOrbColor = color;
- mSearchOrbColorBright = getBrightColor(color);
+ mSearchOrbColorBright = brightColor;
if (mColorAnimator == null) {
setOrbViewColor(color);