diff options
| author | Annie Chin <afchin@google.com> | 2016-12-19 14:31:16 -0800 |
|---|---|---|
| committer | Annie Chin <afchin@google.com> | 2017-01-04 08:52:54 -0800 |
| commit | 96be246c491d663d44017aadfcaad85d8d01c8a8 (patch) | |
| tree | 389684dc758fd7974a8a3924b704aaaf7253dd83 | |
| parent | a3c18ac40a7f3cf7f7d668d91b7a39bc647380ef (diff) | |
| download | android_packages_apps_ExactCalculator-96be246c491d663d44017aadfcaad85d8d01c8a8.tar.gz android_packages_apps_ExactCalculator-96be246c491d663d44017aadfcaad85d8d01c8a8.tar.bz2 android_packages_apps_ExactCalculator-96be246c491d663d44017aadfcaad85d8d01c8a8.zip | |
Change primary color to match spec.
Fixes: 33752155
Update status bar colors to better match.
Change-Id: Ie0872b7371eaf1e85e85a90cf33fcba5b5537d96
| -rw-r--r-- | res/values/color.xml | 8 | ||||
| -rw-r--r-- | res/values/themes.xml | 2 | ||||
| -rw-r--r-- | src/com/android/calculator2/Calculator.java | 4 |
3 files changed, 10 insertions, 4 deletions
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 582f0c9..dd1bab3 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -546,7 +546,7 @@ public class Calculator extends Activity 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(); @@ -1114,7 +1114,7 @@ public class Calculator extends Activity } 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(); |