Merge "Change primary color to match spec." into ub-calculator-euler
diff --git a/res/values/color.xml b/res/values/color.xml
index 78934a0..2f6475f 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -17,9 +17,15 @@
<resources>
- <!-- Default background color for the status bar. -->
+ <!-- Default accent color. -->
<color name="calculator_accent_color">#0097A7</color>
+ <!-- Primary color (Color for the toolbars). -->
+ <color name="calculator_primary_color">#00BCD4</color>
+
+ <!-- Status bar color. -->
+ <color name="calculator_statusbar_color">#0096A9</color>
+
<!-- Color to indicate an error has occured. -->
<color name="calculator_error_color">#C2185B</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b75df94..36adfbe 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,7 +18,7 @@
<resources>
<style name="Theme" parent="@android:style/Theme.Material.Light.DarkActionBar">
- <item name="android:colorPrimary">@color/calculator_accent_color</item>
+ <item name="android:colorPrimary">@color/calculator_primary_color</item>
<item name="android:colorAccent">@color/calculator_accent_color</item>
<item name="android:statusBarColor">@color/calculator_accent_color</item>
<item name="android:windowSoftInputMode">stateAlwaysHidden</item>
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 60731ae..c149e84 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -546,7 +546,7 @@
mResultText.setTextColor(
ContextCompat.getColor(this, R.color.display_result_text_color));
getWindow().setStatusBarColor(
- ContextCompat.getColor(this, R.color.calculator_accent_color));
+ ContextCompat.getColor(this, R.color.calculator_statusbar_color));
}
invalidateOptionsMenu();
@@ -1115,7 +1115,7 @@
}
cancelIfEvaluating(true);
announceClearedForAccessibility();
- reveal(mCurrentButton, R.color.calculator_accent_color, new AnimatorListenerAdapter() {
+ reveal(mCurrentButton, R.color.calculator_primary_color, new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
onClearAnimationEnd();