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

Commit 166c5c6f authored by Ben Lin's avatar Ben Lin
Browse files

Update DragShadow states to UX spec. 

There was an attempt to use LevelListDrawable for the different levels
of background of DocumentHolder, but that resulted in a weird state. Can
revisit that on another attempt.

Bug: 31182423
Change-Id: I74af77557790b1d30e316fa167ffed577eaf9032
parent c717533e

res/drawable/drag_shadow_background.xml

+4 −4
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
      android:width="1dp"

      android:color="#ff9f9f9f" />

  <corners

      android:bottomRightRadius="3dp"

      android:bottomLeftRadius="3dp"

      android:topLeftRadius="3dp"

      android:topRightRadius="3dp"/>

      android:bottomRightRadius="2dp"

      android:bottomLeftRadius="2dp"

      android:topLeftRadius="2dp"

      android:topRightRadius="2dp"/>

</shape>

res/color/item_doc_list_background_activated.xml→res/drawable/drop_badge_states.xml

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

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

<!-- Copyright (C) 2016 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.
@@ -14,11 +14,17 @@ 
     limitations under the License.

-->



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

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

    xmlns:app="http://schemas.android.com/apk/res-auto">

    <item

        android:state_activated="true"

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

        android:alpha="0.1" />

        app:state_droppable="true"

        app:state_drop_hovered="true"

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

    <item

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

        app:state_droppable="false"

        app:state_drop_hovered="true"

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

    <item

        app:state_drop_hovered="false"

        android:drawable="@android:color/transparent" />

</selector>
 
 No newline at end of file

res/drawable/ic_drop_not_ok_badge.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<!--

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

-->



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

        android:width="15dp"

        android:height="15dp"

        android:viewportWidth="30.0"

        android:viewportHeight="30.0">



    <group

         android:name="whiteBg">

        <path

            android:fillColor="#FFFFFFFF"

            android:pathData="M0,15a15,15 0 1,0 30,0a15,15 0 1,0 -30,0" />

    </group>



    <group

         android:name="badge"

         android:translateX="2"

         android:translateY="2">

        <path

            android:fillColor="#FFC53929"

            android:pathData="M3.8056487,3.8056487 C-1.26854957,8.87984696 -1.26854957,17.1162267 3.8056487,22.190425 C8.87984696,27.2646233 17.1162267,27.2646233 22.190425,22.190425 C27.2646233,17.1162267 27.2646233,8.87984696 22.190425,3.8056487 C17.1162267,-1.26854957 8.87984696,-1.26854957 3.8056487,3.8056487 L3.8056487,3.8056487 Z M16.5335708,17.9477843 L12.9980369,14.4122504 L9.46250295,17.9477843 L8.04828938,16.5335708 L11.5838233,12.9980369 L8.04828938,9.46250295 L9.46250295,8.04828938 L12.9980369,11.5838233 L16.5335708,8.04828938 L17.9477843,9.46250295 L14.4122504,12.9980369 L17.9477843,16.5335708 L16.5335708,17.9477843 L16.5335708,17.9477843 Z" />

    </group>

</vector>

res/drawable/ic_drop_ok_badge.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<!--

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

-->

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

        android:width="15dp"

        android:height="15dp"

        android:viewportWidth="30.0"

        android:viewportHeight="30.0">



    <group

         android:name="whiteBg">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M0,15a15,15 0 1,0 30,0a15,15 0 1,0 -30,0" />

    </group>



    <group

         android:name="badge"

         android:translateX="2"

         android:translateY="2">

    <path

        android:fillColor="#FF0B8043"

        android:pathData="M13,0 C5.824,0 0,5.824 0,13 C0,20.176 5.824,26 13,26 C20.176,26 26,20.176 26,13 C26,5.824 20.176,0 13,0 L13,0 Z M19,14 L14,14 L14,19 L12,19 L12,14 L7,14 L7,12 L12,12 L12,7 L14,7 L14,12 L19,12 L19,14 Z" />

    </group>

</vector>

res/drawable/item_doc_list_background.xml

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

<!-- Copyright (C) 2013 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">

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

</shape>