Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a0b31c authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Change primary color to match spec." into ub-calculator-euler

parents 5e13965a 96be246c

res/values/color.xml

+7 −1
Original line number Diff line number Diff line
@@ -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>

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

src/com/android/calculator2/Calculator.java

+2 −2
Original line number Diff line number Diff line
@@ -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();
@@ -1115,7 +1115,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();