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

Commit af6c21b6 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue_2349' into 'v1-pie' 

Polish File Manager UI

See merge request !17
parents 63972a28 9226c049

res/drawable/root_item_background.xml

+15 −7
Original line number Diff line number Diff line
@@ -16,20 +16,28 @@ 


<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">

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

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

    <item

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

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

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



    <item>

        <selector>

            <item

                app:state_highlighted="true"

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

            <item app:state_highlighted="true">

                <color android:color="?android:attr/colorControlHighlight"/>

            </item>

            <item

                app:state_highlighted="false"

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

        </selector>

    </item>



    <item>

        <selector>

            <item

                android:state_activated="true"

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

        </selector>

    </item>

</ripple>

res/drawable/root_list_selector_bg.xml

0 → 100644
+30 −0
Original line number 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.

-->



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

    android:inset="8dp">

    <shape

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

        android:shape="rectangle">

        <corners

            android:topLeftRadius="2dp"

            android:topRightRadius="2dp"

            android:bottomLeftRadius="2dp"

            android:bottomRightRadius="2dp"/>

        <solid

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

    </shape>

</inset>

res/layout/drawer_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
                android:popupTheme="?actionBarPopupTheme" />



            <FrameLayout



                android:id="@+id/container_roots"

                android:layout_width="match_parent"

                android:layout_height="0dp"

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -89,6 +89,6 @@ 
    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>

    <!--black 80%-->

    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>



    <color name="color_default_blue_soft">#A89FCBF8</color>



</resources>

src/com/android/documentsui/DrawerController.java

+4 −10
Original line number Diff line number Diff line
@@ -146,16 +146,10 @@ public abstract class DrawerController implements DrawerListener { 
        public void setDropTargetHighlight(View v, boolean highlight) {

            assert (v.getId() == R.id.drawer_edge);



//            @ColorRes int id = highlight ? R.color.item_doc_background_selected :

//                android.R.color.transparent;

            if(accentColor!=0){

                @ColorRes int id = highlight ? accentColor : android.R.color.transparent;

            @ColorRes int id = highlight ? R.color.item_doc_background_selected :

                android.R.color.transparent;

            v.setBackgroundColor(id);

            }

            else {

                @ColorRes int id = highlight ? R.color.item_doc_background_selected : android.R.color.transparent;

                v.setBackgroundColor(id);

            }





        }