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

Commit 9ddf56e5 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Polish UI and refactor theme color resources(1/N)"

parents a55472f6 06e670cc

res/color/search_chip_background_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

    <item android:state_selected="true" android:color="@color/chip_selected_background_color"/>

    <item android:state_enabled="true" android:color="?attr/colorBackgroundFloating"/>

    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>

    <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>

</selector>
 
 No newline at end of file

res/color/search_chip_stroke_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true" android:color="@android:color/transparent"/>

    <item android:state_pressed="true" android:color="@android:color/transparent"/>

    <item android:state_enabled="true" android:color="@color/chip_stroke_color"/>

    <item android:state_enabled="true" android:color="@color/hairline"/>

    <item android:state_enabled="false" android:color="@android:color/transparent"/>

</selector>
 
 No newline at end of file

res/drawable/apps_row_icon_background.xml→res/color/sort_list_text.xml

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

<!-- Copyright (C) 2018 The Android Open Source Project

<!-- Copyright (C) 2019 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.
@@ -13,10 +13,10 @@ 
     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="oval">



    <solid android:color="?android:attr/colorBackgroundFloating" />



</shape>
 
 No newline at end of file
 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_checked="true"

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

    <item

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

</selector>
 
 No newline at end of file

res/drawable/ic_done.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@color/root_activated_color"

        android:fillColor="?android:colorPrimary"

        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

</vector>

res/drawable/inspector_separator.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
<inset xmlns:android="http://schemas.android.com/apk/res/android"

    android:insetTop="10dp"

    android:insetBottom="10dp" >

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

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

           android:tint="?android:attr/colorForeground">

        <size android:height="1dp"/>

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

        <solid android:color="#1f000000"/>

    </shape>

</inset>
 
 No newline at end of file