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

Commit 517d7348 authored by Jon Mann's avatar Jon Mann
Browse files

resolve merge conflicts of 23026814 to master 

Change-Id: Ieda26dd8a4477e4325294117290ed664793f3698
parents 50dce88c 23026814

res/drawable-ldrtl/roots_list_border.xml

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

<!-- Copyright (C) 2017 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:insetTop="-1dp"

       android:insetBottom="-1dp"

       android:insetRight="-1dp">

    <shape android:shape="rectangle">

        <stroke

            android:width="1dp"

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

    </shape>

</inset>
 
 No newline at end of file

res/drawable/roots_list_border.xml

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

<!-- Copyright (C) 2017 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:insetTop="-1dp"

       android:insetBottom="-1dp"

       android:insetLeft="-1dp">

    <shape android:shape="rectangle">

        <stroke

            android:width="1dp"

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

    </shape>

</inset>
 
 No newline at end of file

res/layout/dropdown_sort_widget.xml

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

        android:fontFamily="sans-serif-medium"

        android:textSize="14sp"

        android:textColor="@color/sort_widget_text_color"/>



    <ImageView

        android:id="@+id/sort_arrow"

res/layout/fragment_roots.xml

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

    android:listSelector="@drawable/root_list_selector"

    android:keyboardNavigationCluster="true"

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

    android:background="@drawable/roots_list_border" />

res/layout/item_root.xml

+8 −6
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="48dp"

    android:paddingStart="@dimen/list_item_padding"

    android:paddingEnd="@dimen/list_item_padding"

    android:paddingStart="25dp"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:baselineAligned="false"
@@ -44,6 +43,7 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="16dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:orientation="vertical"
@@ -56,7 +56,8 @@ 
            android:singleLine="true"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Menu"

            android:fontFamily="sans-serif-medium"

            android:textSize="14sp"

            android:textColor="@color/item_root_primary_text" />



        <TextView
@@ -66,8 +67,9 @@ 
            android:singleLine="true"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Caption"

            android:textColor="@color/item_root_primary_text" />

            android:fontFamily="sans-serif-medium"

            android:textSize="13sp"

            android:textColor="@color/root_details_color" />



    </LinearLayout>