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

Commit bf7e9c39 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

More Material Next changes to RecyclerView items: am: 3d988caf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/14471680

Change-Id: Icb8583cf2e99ba7e3b580abbe691da419ff50a64
parents 6ee49c3b 3d988caf

res/layout-sw720dp/item_doc_list.xml

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:background="@drawable/list_item_background"

    android:foreground="?android:attr/selectableItemBackground"

    android:clickable="true"

    android:focusable="true"

    android:orientation="horizontal" >
@@ -43,6 +45,7 @@ 


            <com.google.android.material.card.MaterialCardView

                app:cardElevation="0dp"

                app:cardBackgroundColor="@android:color/transparent"

                android:layout_width="match_parent"

                android:layout_height="match_parent">

res/layout/item_dir_grid.xml

+7 −6
Original line number Diff line number Diff line
@@ -21,19 +21,21 @@ 
     to focus and selection states, some of which are specific to keyboard

     when touch mode is not enable. So, if you, heroic engineer of the future,

     decide to rip these out, please be sure to check out focus and keyboards. -->

<FrameLayout

<com.google.android.material.card.MaterialCardView

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

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

    android:id="@+id/item_root"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="2dp"

    android:focusable="true">

    android:layout_margin="4dp"

    android:foreground="?android:attr/selectableItemBackground"

    android:clickable="true"

    android:focusable="true"

    app:cardElevation="0dp">



    <com.google.android.material.card.MaterialCardView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="2dp"

        android:elevation="0dp"

        android:duplicateParentState="true"

        app:cardElevation="0dp"
@@ -106,9 +108,8 @@ 
    <View

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_margin="1dp"

        android:background="@drawable/item_doc_grid_border_rounded"

        android:contentDescription="@null"

        android:duplicateParentState="true"/>



</FrameLayout>
 
 No newline at end of file
 
</com.google.android.material.card.MaterialCardView>
 
 No newline at end of file

res/layout/item_doc_grid.xml

+7 −6
Original line number Diff line number Diff line
@@ -20,19 +20,21 @@ 
     to focus and selection states, some of which are specific to keyboard

     when touch mode is not enable. So, if you, heroic engineer of the future,

     decide to rip these out, please be sure to check out focus and keyboards. -->

<FrameLayout

<com.google.android.material.card.MaterialCardView

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

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

    android:id="@+id/item_root"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="2dp"

    android:focusable="true">

    android:layout_margin="4dp"

    android:foreground="?android:attr/selectableItemBackground"

    android:clickable="true"

    android:focusable="true"

    app:cardElevation="0dp">



    <com.google.android.material.card.MaterialCardView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="2dp"

        android:elevation="0dp"

        android:duplicateParentState="true"

        app:cardElevation="0dp"
@@ -199,9 +201,8 @@ 
    <View

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_margin="1dp"

        android:background="@drawable/item_doc_grid_border_rounded"

        android:contentDescription="@null"

        android:duplicateParentState="true"/>



</FrameLayout>
 
</com.google.android.material.card.MaterialCardView>

res/layout/item_doc_list.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/list_item_background"

    android:foreground="?android:attr/selectableItemBackground"

    android:clickable="true"

    android:focusable="true"

    android:orientation="vertical">