Merge "[DocsUI M3] Restyle banner" into main (af7c936e) · Commits · e / os / android_packages_apps_DocumentsUI

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

+12 −16

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		<FrameLayout
		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">
		@@ -24,17 +23,15 @@
		<com.google.android.material.card.MaterialCardView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_margin="4dp"
		android:elevation="0dp"
		android:duplicateParentState="true"
		app:cardElevation="0dp"
		app:strokeWidth="1dp"
		app:strokeColor="?android:strokeColor">
		style="@style/BannerStyle"
		android:duplicateParentState="true">

		<LinearLayout
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:background="?android:attr/colorBackground"
		android:paddingVertical="@dimen/banner_content_padding_vertical"
		android:paddingStart="@dimen/banner_content_padding_start"
		android:paddingEnd="@dimen/banner_content_padding_end"
		android:orientation="vertical">

		<LinearLayout
		@@ -43,6 +40,7 @@
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:minHeight="60dp"
		android:gravity="center_vertical"
		android:orientation="horizontal">

		<ImageView
		@@ -58,8 +56,6 @@
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:minHeight="48dp"
		android:paddingTop="12dp"
		android:paddingEnd="12dp"
		android:gravity="center_vertical"
		android:orientation="vertical">

		@@ -67,23 +63,23 @@
		android:id="@+id/message_title"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textSize="16sp"
		android:textAppearance="@style/DrawerMenuPrimary"/>
		android:textAppearance="@style/BannerTitleText"/>

		<com.google.android.material.textview.MaterialTextView
		android:id="@+id/message_subtitle"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:selectAllOnFocus="true"
		android:textSize="12sp"/>
		android:textAppearance="@style/BannerSubtitleText"/>

		<com.google.android.material.textview.MaterialTextView
		android:id="@+id/message_textview"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:selectAllOnFocus="true"/>
		android:selectAllOnFocus="true"
		android:textAppearance="@style/BannerMessageText"/>

		<Button
		<com.google.android.material.button.MaterialButton
		android:id="@+id/dismiss_button"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		@@ -100,7 +96,7 @@
		android:layout_width="match_parent"
		android:orientation="vertical">

		<Button
		<com.google.android.material.button.MaterialButton
		android:id="@+id/action_button"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,10 @@
		<dimen name="cross_profile_button_message_margin_top">@dimen/space_extra_small_2</dimen>
		<dimen name="cross_profile_button_margin_top">@dimen/space_small_1</dimen>

		<dimen name="banner_content_padding_vertical">16dp</dimen>
		<dimen name="banner_content_padding_start">@dimen/space_medium_1</dimen>
		<dimen name="banner_content_padding_end">8dp</dimen>

		<dimen name="focus_ring_width">3dp</dimen>
		<!-- 3dp focus ring width + 2dp gap between the ring and the content -->
		<dimen name="focus_ring_gap">5dp</dimen>

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -229,4 +229,11 @@
		<item name="android:textAppearance">@style/JobProgressItemActionButtonText</item>
		</style>


		<style name="BannerStyle" parent="@style/Widget.Material3.CardView.Filled">
		<item name="android:layout_marginTop">16dp</item>
		<item name="android:layout_marginBottom">4dp</item>
		<item name="strokeWidth">0dp</item>
		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
		</style>
		</resources>

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -176,4 +176,19 @@
		<item name="fontFamily">@string/config_fontFamily</item>
		</style>

		<style name="BannerTitleText" parent="@style/TextAppearance.Material3.TitleMedium">
		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
		<item name="fontFamily">@string/config_fontFamilyMedium</item>
		</style>

		<style name="BannerSubtitleText" parent="@style/TextAppearance.Material3.BodyMedium">
		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
		<item name="fontFamily">@string/config_fontFamily</item>
		</style>

		<style name="BannerMessageText" parent="@style/TextAppearance.Material3.BodyMedium">
		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
		<item name="fontFamily">@string/config_fontFamily</item>
		</style>

		</resources>