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

Commit 042dad7c authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Clean up usage of theme colors, deprecated Resources.getColor* methods"

parents 2b73eb67 55eaa96f

res/color/lock_pattern_view_success_color.xml

0 → 100644
+19 −0
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.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:attr/colorAccent" />

</selector>

res/color/unlock_pattern_view_success_color.xml

0 → 100644
+19 −0
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.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:attr/colorAccent" />

</selector>

res/values/colors.xml

+0 −7
Original line number Diff line number Diff line
@@ -53,11 +53,9 @@ 


    <color name="lock_pattern_background">#00000000</color>

    <color name="lock_pattern_view_regular_color">#ff37474f</color>

    <color name="lock_pattern_view_success_color">@color/theme_accent</color>

    <color name="lock_pattern_view_error_color">#fff4511e</color>



    <color name="unlock_pattern_view_regular_color">@android:color/white</color>

    <color name="unlock_pattern_view_success_color">@color/theme_accent</color>

    <color name="unlock_pattern_view_error_color">#fff4511e</color>



    <color name="fingerprint_title_area_bg">#ff009688</color>
@@ -72,11 +70,6 @@ 


    <color name="card_background">#ffffffff</color>



    <!-- Palette colors referenced by top-level themes. -->

    <color name="theme_primary">#ff263238</color>

    <color name="theme_primary_dark">#ff21272b</color>

    <color name="theme_accent">#ff009688</color>



    <color name="switchbar_background_color">#ff37474f</color>

    <color name="switch_accent_color">#ff7fcac3</color>

res/values/styles.xml

+2 −3
Original line number Diff line number Diff line
@@ -335,9 +335,8 @@ 
    <style name="TextAppearance.Switch" parent="TextAppearance.Medium">

    </style>



    <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">

        <item name="android:textColor">@color/theme_accent</item>

        <item name="android:textStyle">bold</item>

    <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">

src/com/android/settings/DataUsageSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 


        mBinding = false;



        int seriesColor = resources.getColor(R.color.sim_noitification);

        int seriesColor = context.getColor(R.color.sim_noitification);

        if (mCurrentTab != null && mCurrentTab.length() > TAB_MOBILE.length() ){

            final int slotId = Integer.parseInt(mCurrentTab.substring(TAB_MOBILE.length(),

                    mCurrentTab.length()));