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

Commit 3749a8d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update material_deep_teal_500 to #008577." into pi-dev

parents 61e6b87e c71ebe42

res/drawable-nodpi/fp_enrollment_header.png

deleted100644 → 0
−127 KiB
Loading image diff...

res/values-land/colors.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<resources>

    <drawable name="fp_enrollment_header">#009688</drawable>

</resources>

res/values/colors.xml

+1 −3
Original line number Diff line number Diff line
@@ -54,13 +54,11 @@ 
    <color name="running_processes_free_ram">#ffced7db</color>



    <color name="wifi_divider">#ffe0e0e0</color>

    <color name="sim_noitification">@*android:color/material_deep_teal_500</color>

    <color name="sim_noitification">@*android:color/accent_device_default_light</color>



    <color name="confirm_device_credential_transparent_black">#60000000</color>

    <color name="voice_interaction_highlight">#33b5e5</color>



    <drawable name="fp_enrollment_header_landscape">#009688</drawable>



    <color name="memory_normal">#ff009587</color>

    <color name="memory_moderate">#ffF3B300</color>

    <color name="memory_low">#ffff9700</color>

src/com/android/settings/fuelgauge/BatteryHistoryChart.java

+9 −8
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ public class BatteryHistoryChart extends View { 
        mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                2, getResources().getDisplayMetrics());



        mBatteryBackgroundPaint.setColor(0xFF009688);

        int accentColor = Utils.getColorAccent(mContext);

        mBatteryBackgroundPaint.setColor(accentColor);

        mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);

        mBatteryGoodPaint.setARGB(128, 0, 128, 0);

        mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
@@ -383,13 +384,13 @@ public class BatteryHistoryChart extends View { 
        mPhoneSignalChart.setColors(com.android.settings.Utils.BADNESS_COLORS);

        mDebugRectPaint.setARGB(255, 255, 0, 0);

        mDebugRectPaint.setStyle(Paint.Style.STROKE);

        mScreenOnPaint.setColor(0xFF009688);

        mGpsOnPaint.setColor(0xFF009688);

        mCameraOnPaint.setColor(0xFF009688);

        mFlashlightOnPaint.setColor(0xFF009688);

        mWifiRunningPaint.setColor(0xFF009688);

        mCpuRunningPaint.setColor(0xFF009688);

        mChargingPaint.setColor(0xFF009688);

        mScreenOnPaint.setColor(accentColor);

        mGpsOnPaint.setColor(accentColor);

        mCameraOnPaint.setColor(accentColor);

        mFlashlightOnPaint.setColor(accentColor);

        mWifiRunningPaint.setColor(accentColor);

        mCpuRunningPaint.setColor(accentColor);

        mChargingPaint.setColor(accentColor);



        TypedArray a =

            context.obtainStyledAttributes(