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

Commit 6adae06e authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Update drag and drop visualizations" into sc-dev

parents 4b162b13 f7ca3b4e

res/color/cell_layout_bg_color_active.xml

0 → 100644
+5 −0
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.4"

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

</selector>

res/color/cell_layout_bg_color_inactive.xml

0 → 100644
+5 −0
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>
 
 No newline at end of file

res/drawable/bg_celllayout.xml

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

            <stroke

                android:width="@dimen/spring_loaded_panel_border"

                android:color="@color/spring_loaded_highlighted_panel_border_color" />

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

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

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

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



        </shape>

    </item>

    <item>

        <shape android:shape="rectangle" >

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

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

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

        </shape>

    </item>

</selector>

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    <attr name="folderTextColor" format="color" />

    <attr name="folderHintColor" format="color" />

    <attr name="workProfileOverlayTextColor" format="color" />

    <attr name="gridColor" format="color" />



    <!-- BubbleTextView specific attributes. -->

    <declare-styleable name="BubbleTextView">

res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    <integer name="config_dragOutlineFadeTime">900</integer>



    <!-- The alpha value at which to show the most recent drop visualization outline. -->

    <integer name="config_dragOutlineMaxAlpha">128</integer>

    <integer name="config_dragOutlineMaxAlpha">255</integer>



    <!-- Parameters controlling the animation for when an item is dropped on the home screen,

         and it animates from its old position to the new one. -->