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

Commit 1ee64658 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'Q_1923' into 'v1-q' 

Q 1923

See merge request !14
parents 82cd0bf1 1649ab8b

res/color/search_chip_background_color.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
  -->



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

    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>

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

    <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_ripple_color.xml

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

    <!-- Selected. -->

    <item android:state_pressed="true" android:state_selected="true"

          android:alpha="0.16" android:color="?android:colorPrimary"/>

          android:alpha="0.16" android:color="@color/color_default_blue1"/>

    <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"

          android:alpha="0.16" android:color="?android:colorPrimary"/>

          android:alpha="0.16" android:color="@color/color_default_blue1"/>

    <item android:state_focused="true" android:state_selected="true"

          android:alpha="0.12" android:color="?android:colorPrimary"/>

          android:alpha="0.12" android:color="@color/color_default_blue1"/>

    <item android:state_hovered="true" android:state_selected="true"

          android:alpha="0.04" android:color="?android:colorPrimary"/>

          android:alpha="0.04" android:color="@color/color_default_blue1"/>

    <item android:state_selected="true"

          android:alpha="0.00" android:color="?android:colorPrimary"/>

          android:alpha="0.00" android:color="@color/color_default_blue1"/>



    <!-- Unselected. -->

    <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>

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="?android:strokeColor"/>

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

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

</selector>
 
 No newline at end of file

res/drawable/ic_check_circle.xml

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ Copyright (C) 2016 The Android Open Source Project 
        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

    android:tint="@color/color_default_blue1"

    >

    <path

        android:fillColor="?android:attr/colorPrimary"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>

res/drawable/ic_hamburger.xml

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

        android:viewportHeight="24"

    android:tint="@color/color_default_primary_text"

    >

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>