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

Commit df3227a1 authored by Cassy Chun-Crogan's avatar Cassy Chun-Crogan
Browse files

Revert "[DocsUI M3] Centre items in grid layout" 

Revert submission 32486319

Reason for revert: The FrameLayout makes the clickable area of the grid
item far too large. This leads to weird behaviour such as the hover
state appear when the user's cursor is far away from the visible item.

Reverted changes: /q/submissionid:32486319

Change-Id: I6b99b8568ad79f49b3b75feb15d1c95907ea5f80
parent 267493dc

res/flag(com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml

+144 −151
Original line number Diff line number Diff line
@@ -13,24 +13,19 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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



<RelativeLayout 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:clickable="true"

    android:defaultFocusHighlightEnabled="false"

    android:focusable="true">



    <RelativeLayout

    android:layout_width="@dimen/grid_width"

    android:layout_height="@dimen/grid_height"

    android:layout_margin="@dimen/grid_item_margin"

        android:layout_gravity="center_horizontal"

    android:clickable="true"

    android:defaultFocusHighlightEnabled="false"

    android:focusable="true"

    android:paddingEnd="@dimen/grid_item_padding_end"

    android:paddingStart="@dimen/grid_item_padding_start"

        android:paddingTop="@dimen/grid_item_padding_top"

        android:duplicateParentState="true">

    android:paddingTop="@dimen/grid_item_padding_top">



<!-- Main item thumbnail.  Comprised of two overlapping images, the

         visibility of which is controlled by code in
@@ -126,7 +121,7 @@ 
                android:src="@drawable/ic_briefcase"

                android:tint="?android:attr/colorAccent" />



                <com.google.android.material.textview.MaterialTextView

            <TextView

                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -144,7 +139,7 @@ 
            android:gravity="center"

            android:orientation="horizontal">



                <com.google.android.material.textview.MaterialTextView

            <TextView

                android:id="@+id/details"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -154,7 +149,7 @@ 
                android:textAlignment="viewStart"

                android:textAppearance="@style/ItemCaptionText" />



                <com.google.android.material.textview.MaterialTextView

            <TextView

                android:id="@+id/bullet"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -164,7 +159,7 @@ 
                android:textAlignment="viewStart"

                android:textAppearance="@style/ItemCaptionText" />



                <com.google.android.material.textview.MaterialTextView

            <TextView

                android:id="@+id/date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -178,5 +173,3 @@ 
    </LinearLayout>



</RelativeLayout>
 
 No newline at end of file
 


</FrameLayout>
 
 No newline at end of file