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

Commit 30f83b85 authored by Luciano Pacheco's avatar Luciano Pacheco
Browse files

DocsUI M3: Fix M3 prefix in some material3 resources 

The script used to update the IDs ignored the resource files without the
_m3 prefix. This CL fixes that.

Bug: 414914819, 403375773
Test: m DocumentsUIGoogle
Flag: com.android.documentsui.flags.use_material3
Change-Id: Ie7b53a3a103c3dc477b47e9738060a44f7974663
parent d842dd59

res/flag(com.android.documentsui.flags.use_material3)/drawable/breadcrumb_item_mask.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    <corners android:radius="@dimen/breadcrumb_item_height" />

    <corners android:radius="@dimen/breadcrumb_item_height_m3" />

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <solid android:color="@android:color/white" />

</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_mask.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    <corners android:radius="@dimen/list_item_height" />

    <corners android:radius="@dimen/list_item_height_m3" />

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <solid android:color="@android:color/white" />

</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp-h600dp/fragment_save_cancel_button.xml

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

    android:id="@android:id/button2"

    style="@style/MaterialTonalButton"

    app:cornerRadius="@dimen/button_corner_radius"

    app:cornerRadius="@dimen/button_corner_radius_m3"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"

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

+5 −5
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
<!-- Transparent container so shadow layer can be drawn -->

<FrameLayout

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

    android:layout_width="@dimen/drag_shadow_width"

    android:layout_height="@dimen/drag_shadow_height"

    android:background="@color/item_drag_shadow_container_background">

    android:layout_width="@dimen/drag_shadow_width_m3"

    android:layout_height="@dimen/drag_shadow_height_m3"

    android:background="@color/item_drag_shadow_container_background_m3">



    <View

        android:layout_width="@dimen/drag_content_width"

        android:layout_height="@dimen/drag_content_height"

        android:layout_marginTop="@dimen/drag_additional_layer_margin_top"

        android:layout_marginStart="@dimen/drag_shadow_radius"

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

        android:layout_marginStart="@dimen/drag_shadow_radius_m3"

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

</FrameLayout>
 
 No newline at end of file

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

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

    android:id="@android:id/button2"

    style="@style/Widget.Material3.Button.TonalButton"

    app:cornerRadius="@dimen/button_corner_radius"

    app:cornerRadius="@dimen/button_corner_radius_m3"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"