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

Commit 4b432009 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Update colors for edit state" into udc-dev

parents 3eba77ca e8efdc4b

res/color/cell_layout_bg_color_inactive.xml→res/color/cell_layout_bg_color.xml

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

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

    <item android:alpha="0.25"

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

    <item android:alpha="0.35"

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

</selector>
 
 No newline at end of file

res/color/cell_layout_bg_color_active.xml

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

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

    <item android:alpha="0.3"

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

</selector>

res/drawable-v28/bg_celllayout.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ 
        <shape android:shape="rectangle" >

            <stroke

                android:width="@dimen/spring_loaded_panel_border"

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

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

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

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

            <corners android:radius="?android:attr/dialogCornerRadius" />



        </shape>

    </item>

    <item>

        <shape android:shape="rectangle" >

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

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

            <corners android:radius="?android:attr/dialogCornerRadius" />

        </shape>

    </item>

res/drawable/bg_celllayout.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ 
        <shape android:shape="rectangle" >

            <stroke

                android:width="@dimen/spring_loaded_panel_border"

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

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

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

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

            <corners android:radius="@dimen/bg_round_rect_radius" />



        </shape>

    </item>

    <item>

        <shape android:shape="rectangle" >

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

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

            <corners android:radius="@dimen/bg_round_rect_radius" />

        </shape>

    </item>

res/drawable/drop_target_frame_hover.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->

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

    android:shape="rectangle">

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

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

    <corners android:radius="@dimen/drop_target_button_frame_radius" />

</shape>
 
 No newline at end of file