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

Commit 4a115e0d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13453734 from de611f98 to 25Q3-release 

Change-Id: I7d96376371ffe6db2e799abc96805a1295826dd6
parents a7c2f250 de611f98

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

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


<ripple

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

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

    android:color="@color/breadcrumb_item_ripple_color">

    <item

        android:id="@android:id/mask"
@@ -24,6 +23,9 @@ 


    <item>

        <selector>

            <item android:state_enabled="false">

                <color android:color="@android:color/transparent"/>

            </item>

            <item android:state_pressed="true">

                <shape android:tint="?attr/colorOnSurfaceVariant">

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

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2025 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<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:paddingStart="@dimen/picker_saver_padding_start"

    android:paddingEnd="@dimen/picker_saver_padding_end"

    android:paddingBottom="@dimen/picker_saver_padding_bottom"

    android:paddingTop="@dimen/picker_saver_padding_top"

    android:background="?attr/colorSurfaceContainer"

    android:baselineAligned="false"

    android:gravity="center_vertical|end"

    android:orientation="horizontal">



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

            android:id="@+id/button_cancel"

            style="@style/MaterialTonalButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/picker_saver_button_gap"

            android:layout_marginTop="@dimen/picker_saver_button_gap"

            android:layout_marginBottom="@dimen/picker_saver_button_gap"

            android:text="@android:string/cancel"

            app:cornerRadius="@dimen/button_corner_radius_m3" />



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

            android:id="@+id/button_pick"

            style="@style/MaterialButtonM3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/picker_saver_button_gap"

            android:layout_marginTop="@dimen/picker_saver_button_gap"

            android:layout_marginBottom="@dimen/picker_saver_button_gap"

            android:text="@string/menu_select"

            app:cornerRadius="@dimen/button_corner_radius_m3" />

</LinearLayout>

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

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

            android:layout_marginTop="@dimen/job_progress_item_padding"

            android:layout_marginStart="@dimen/job_progress_item_padding"

            app:layout_constrainedHeight="true"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toStartOf="@id/job_progress_item_expand"

            app:layout_constraintTop_toTopOf="parent" />

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

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


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

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

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

    style="@style/JobProgressToolbarIndicatorStyle"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

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

+11 −2
Original line number Diff line number Diff line
@@ -21,14 +21,23 @@ 
    android:layout_height="wrap_content"

    android:minHeight="@dimen/breadcrumb_height"

    android:gravity="center_vertical"

    android:focusable="true"

    android:clickable="true"

    android:defaultFocusHighlightEnabled="false"

    android:orientation="horizontal">



    <!-- We can't put clickable/focusable on the TextView below even though we only want the

         highlight/focus ring on the TextView instead of the whole item, this is because there is a

         specific logic in HorizontalBreadcrumb when binding click event, the event is bound

         on the whole item directly and there are special a11y handling (check the

         `setAccessibilityDelegateCompat` call). Given we don't want the focus background on

         the item, we also need defaultFocusHighlightEnabled above and duplicateParentState

         below.  -->

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

        android:id="@+id/breadcrumb_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:focusable="true"

        android:clickable="true"

        android:duplicateParentState="true"

        android:maxWidth="275dp"

        android:gravity="center_vertical"

        android:maxLines="1"