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

Commit d8d7c255 authored by Ben Lin's avatar Ben Lin
Browse files

Drag and Drop UI Polish. 

Bug: 31182423
Change-Id: I2bf644c788ba2431ef3ff8ca9155c661f21c64c8
parent bf01dcab

res/drawable/drag_shadow_background.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

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

  <stroke

      android:width="1dp"

      android:color="#ff9f9f9f" />

  <corners

      android:bottomRightRadius="2dp"

      android:bottomLeftRadius="2dp"

res/drawable/ic_drop_not_ok_badge.xml

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ Copyright (C) 2016 The Android Open Source Project 
-->



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

        android:width="15dp"

        android:height="15dp"

        android:viewportWidth="30.0"

        android:viewportHeight="30.0">

        android:width="14dp"

        android:height="14dp"

        android:viewportWidth="28.0"

        android:viewportHeight="28.0">



    <group

         android:name="whiteBg">

res/drawable/ic_drop_ok_badge.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ Copyright (C) 2016 The Android Open Source Project 
    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">

        android:width="14dp"

        android:height="14dp"

        android:viewportWidth="28.0"

        android:viewportHeight="28.0">



    <group

         android:name="whiteBg">

res/layout/drag_shadow_layout.xml

+26 −16
Original line number Diff line number Diff line
@@ -14,13 +14,21 @@ 
     limitations under the License.

-->



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

<!-- Transparent container so shadow layer can be drawn -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingStart="8dp"

    android:paddingEnd="8dp"

    android:padding="8dp"

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



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        android:orientation="horizontal"

    android:gravity="center_vertical|left"

        android:gravity="center_vertical"

        android:background="@drawable/drag_shadow_background">



        <include layout="@layout/drop_badge"/>
@@ -33,6 +41,8 @@ 
            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textColor="@color/item_title"

        android:paddingStart="8dp"/>

            android:paddingStart="6dp"

            android:paddingBottom="1dp"/>



    </LinearLayout>

</LinearLayout>

res/layout/drop_badge.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
<com.android.documentsui.DropBadgeView

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

        android:id="@android:id/icon"

        android:layout_width="@dimen/root_icon_size"

        android:layout_height="@dimen/root_icon_size"

        android:layout_width="26dp"

        android:layout_height="26dp"

        android:scaleType="centerInside"

        android:contentDescription="@null"

        android:duplicateParentState="true"/>
 
 No newline at end of file