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

Commit 0f383719 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Point inflated messages to use EmptyStateTitleTextM3." into main

parents 867b243b ae54eebc

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

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ 
        android:layout_height="wrap_content"

        android:layout_marginBottom="25dp"

        android:gravity="center_horizontal"

        style="?android:attr/textAppearanceListItem"/>

        style="@style/EmptyStateTitleTextM3"/>



</LinearLayout>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

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

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

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

            android:id="@+id/message"

            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top_m3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

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

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

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

            android:id="@+id/button"

            android:layout_marginTop="@dimen/cross_profile_button_margin_top"

res/flag(com.android.documentsui.flags.use_material3)/values/styles_text_m3.xml

+6 −2
Original line number Diff line number Diff line
@@ -125,11 +125,15 @@ 
        <item name="android:textColor">@color/horizontal_breadcrumb_color_m3</item>

    </style>



    <style name="EmptyStateTitleTextM3" parent="@style/TextAppearance.DocumentsUI.TitleMedium">

    <style name="CrossProfileTitleTextM3" parent="@style/TextAppearance.DocumentsUI.TitleMedium">

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

    </style>



    <style name="EmptyStateMessageTextM3" parent="@style/TextAppearance.DocumentsUI.BodyMedium">

    <style name="CrossProfileMessageTextM3" parent="@style/TextAppearance.DocumentsUI.BodyMedium">

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

    </style>



    <style name="EmptyStateTitleTextM3" parent="@style/TextAppearance.DocumentsUI.TitleMedium">

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

    </style>

src/com/android/documentsui/util/ThemeUtils.kt

+0 −1
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ private fun initializeIdMapping() { 
    R.style.DrawerMenuHeader to R.style.DrawerMenuHeaderM3,

    R.style.DrawerMenuPrimary to R.style.DrawerMenuPrimaryM3,

    R.style.DrawerMenuSecondary to R.style.DrawerMenuSecondaryM3,

    R.style.EmptyStateMessageText to R.style.EmptyStateMessageTextM3,

    R.style.EmptyStateTitleText to R.style.EmptyStateTitleTextM3,

    R.style.InspectorKeySubTitle to R.style.InspectorKeySubTitleM3,

    R.style.ItemCaptionText to R.style.ItemCaptionTextM3,