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

Commit 57facaf7 authored by Garfield, Tan's avatar Garfield, Tan
Browse files

Suppress auto-closing drawer and add ripple effect on spring load roots. 

Bug: 28865182
Change-Id: Ief7967e33b9a0d7e94a667172121d8007f78115b
parent 19cf55b1

res/drawable/root_item_background.xml

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

<!-- 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.

-->



<ripple

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

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

    android:color="?attr/colorControlHighlight">

    <item

        android:id="@android:id/mask"

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



    <item>

        <selector>

            <item

                app:state_highlighted="true"

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

            <item

                app:state_highlighted="false"

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

        </selector>

    </item>

</ripple>
 
 No newline at end of file

res/layout/fragment_roots.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,5 +19,6 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dp"

    android:paddingTop="8dp"

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

    android:drawSelectorOnTop="true"

    android:drawSelectorOnTop="true"

    android:divider="@null" />
 
    android:divider="@null" />

res/layout/item_root.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





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

<com.android.documentsui.RootItemView

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="48dp"

    android:minHeight="48dp"
@@ -22,7 +23,8 @@ 
    android:paddingEnd="@dimen/list_item_padding"

    android:paddingEnd="@dimen/list_item_padding"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:orientation="horizontal"

    android:baselineAligned="false">

    android:baselineAligned="false"

    android:background="@drawable/root_item_background">





    <FrameLayout

    <FrameLayout

        android:layout_width="@dimen/icon_size"

        android:layout_width="@dimen/icon_size"
@@ -68,4 +70,4 @@ 




    </LinearLayout>

    </LinearLayout>





</LinearLayout>
 
</com.android.documentsui.RootItemView>

res/values/attrs.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,8 @@ 
    <declare-styleable name="DocumentsTheme">

    <declare-styleable name="DocumentsTheme">

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

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

    </declare-styleable>

    </declare-styleable>



    <declare-styleable name="RootItemView">

        <attr name="state_highlighted" format="boolean"/>

    </declare-styleable>

</resources>
 
</resources>

res/values/tags.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources>

<resources>

    <item name="drag_hovering_tag" type="id" />

    <item name="drag_hovering_tag" type="id" />

    <item name="item_position_tag" type="id" />

    <item name="item_position_tag" type="id" />

    <item name="layout_id_tag" type="id" />

</resources>
 
</resources>
 
 No newline at end of file