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

Commit c7815559 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "Refactor color definition for customization"

parents 9380bea9 e404f76e

res/drawable/bottom_bar_positive_button_background.xml

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

<!--

  ~ Copyright (C) 2017 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.

  -->



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

    android:shape="rectangle">

    <corners android:radius="2dp" />

    <solid android:color="@color/primary" />

</shape>
 
 No newline at end of file

res/drawable/root_item_background.xml

+8 −0
Original line number Diff line number Diff line
@@ -32,4 +32,12 @@ 
                android:drawable="@android:color/transparent"/>

        </selector>

    </item>



    <item>

        <selector>

            <item

                android:state_activated="true"

                android:drawable="@drawable/root_list_selector"/>

        </selector>

    </item>

</ripple>
 
 No newline at end of file

res/drawable/root_list_selector.xml

+11 −8
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@ 
     limitations under the License.

-->



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

<shape

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

    android:shape="rectangle">

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="0dp"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>



  <item

    android:state_focused="true"

    android:state_pressed="false">

      <color android:color="@color/root_focus_color" />

  </item>



</selector>
 
 No newline at end of file
 
    <solid

        android:color="?android:attr/colorControlHighlight"/>

</shape>
 
 No newline at end of file

res/values-night/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


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

    <style name="ActionBarTheme" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">

        <item name="android:colorPrimaryDark">@color/g_light_grey</item>

        <item name="android:colorPrimary">@color/g_dark_grey</item>

        <item name="android:colorControlNormal">@color/g_light_grey</item>

        <item name="android:textColorHighlight">@color/text_highlight_dark</item>

        <item name="android:textColorPrimary">@color/g_light_grey</item>

res/values-night/themes.xml

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
        <item name="android:statusBarColor">?android:attr/colorPrimary</item>

        <item name="android:navigationBarColor">?android:attr/colorPrimary</item>



        <item name="colorControlHighlight">@color/g_grey</item>

        <item name="materialCardViewStyle">@style/CardViewStyle</item>



        <item name="textHandleColor">@color/text_handle_dark</item>