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

Commit 51e193f3 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Restyle error messages in the file area 

Check the attached bug for before/after comparison.

Bug: 405862827
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: I3323f22b6cea9622484c4fc1616b26143d761607
parent 92254810

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

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:id="@android:id/empty"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?attr/colorSurfaceBright"

    android:focusable="true">

    android:background="?attr/colorSurfaceBright">



    <include android:id="@+id/content" layout="@layout/item_doc_inflated_message_content"/>

    <include android:id="@+id/cross_profile"

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

+8 −15
Original line number Diff line number Diff line
@@ -17,23 +17,19 @@ 


<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center_horizontal"

    android:paddingTop="@dimen/item_doc_inflated_message_padding_top"

    android:paddingStart="72dp"

    android:paddingEnd="72dp">

    android:paddingVertical="@dimen/item_doc_inflated_message_padding_vertical">



    <ProgressBar

    <com.google.android.material.progressindicator.CircularProgressIndicator

        android:id="@+id/cross_profile_progress"

        style="@android:style/Widget.Material.Light.ProgressBar"

        android:visibility="gone"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:indeterminate="true"

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

        android:layout_marginBottom="@dimen/cross_profile_progress_margin_bottom"

        android:indeterminate="true"/>



    <LinearLayout

        android:id="@+id/cross_profile_content"
@@ -48,7 +44,7 @@ 
            android:layout_height="24dp"/>

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

            android:id="@+id/title"

            android:layout_marginTop="8dp"

            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"
@@ -60,14 +56,11 @@ 
            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

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

        <Button

        <com.google.android.material.button.MaterialButton

            android:id="@+id/button"

            android:layout_marginTop="16dp"

            android:layout_marginTop="@dimen/cross_profile_button_margin_top"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:cornerRadius="@dimen/cross_profile_button_corner_radius"

            app:strokeWidth="@dimen/cross_profile_button_stroke_width"

            app:strokeColor="@color/work_profile_button_stroke_color"

            style="@style/EmptyStateButton"/>

            style="@style/MaterialOutlinedButton"/>

    </LinearLayout>

</LinearLayout>

res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml

+1 −6
Original line number Diff line number Diff line
@@ -16,14 +16,9 @@ 
<resources>

  <!-- ?attr/colorPrimary -->

  <color name="primary">@android:color/system_accent1_200</color>

  <!-- accent 200 -->

  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_200

  </color> <!-- accent 200 -->

  <color name="empty_state_text_color">@*android:color/system_neutral1_100

  </color>

  <!-- neutral 100 -->

  <color name="empty_state_message_text_color">

    @*android:color/system_neutral2_200

  </color>

  <!-- neutral variant 100 -->

  <color name="fragment_pick_inactive_button_color">

res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml

+0 −7
Original line number Diff line number Diff line
@@ -21,11 +21,4 @@ 
        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="EmptyStateButton" parent="@style/Widget.Material3.Button.OutlinedButton">

        <item name="android:backgroundTint">@android:color/transparent</item>

        <item name="android:textColor">@*android:color/system_neutral1_100</item>

        <item name="android:textAllCaps">false</item>

        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>

    </style>

</resources>

res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
    <color name="secondary">#3D8AB4F8</color>

    <color name="hairline">#5F6368</color>



    <color name="empty_state_text_color">@android:color/white</color>

    <color name="error_image_color">@android:color/white</color>



    <color name="edge_effect">@android:color/white</color>