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

Commit 9ffcf69d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13316154 from c6c97f12 to 25Q3-release 

Change-Id: I452064204d30fb163d52f35ba3dc28c3c2685044
parents 07ede166 c6c97f12

res/flag(com.android.documentsui.flags.use_material3)/color/doc_list_item_badge_icon_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



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

    <item android:state_selected="true" android:color="?attr/colorOnPrimary" />

    <item android:color="?attr/colorSecondary" />

    <item android:state_selected="true" android:color="?attr/colorOnPrimaryContainer" />

    <item android:color="?attr/colorOnSurface" />

</selector>

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

0 → 100644
+20 −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.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/colorSurfaceContainerLow" />

    <corners android:radius="16dp" />

</shape>

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

+5 −1
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ 
        android:height="24dp"

        android:viewportWidth="960"

        android:viewportHeight="960">

     <!--

          White is unused here, the actual color is supplied in

          doc_list_item_badge_icon_color as android:tint.

     -->

    <path

        android:fillColor="?attr/colorOnSurface"

        android:fillColor="@android:color/white"

        android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z" />

</vector>

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

+6 −10
Original line number Diff line number Diff line
@@ -21,26 +21,24 @@ 
    android:layout_weight="1"

    android:minWidth="@dimen/apps_row_item_width"

    android:paddingBottom="@dimen/apps_row_exit_icon_margin_bottom"

    android:paddingStart="@dimen/apps_row_item_padding_horizontal"

    android:paddingEnd="@dimen/apps_row_item_padding_horizontal"

    android:orientation="vertical"

    android:background="@drawable/generic_ripple_background"

    android:background="@drawable/nav_rail_item_icon_background"

    android:gravity="center_horizontal">



    <ImageView

        android:id="@+id/app_icon"

        android:layout_width="@dimen/apps_row_app_icon_size"

        android:layout_height="@dimen/apps_row_app_icon_size"

        android:layout_marginTop="@dimen/apps_row_app_icon_margin_top"

        android:layout_marginBottom="@dimen/apps_row_app_icon_margin_bottom"

        android:layout_marginStart="@dimen/apps_row_app_icon_margin_horizontal"

        android:layout_marginEnd="@dimen/apps_row_app_icon_margin_horizontal"/>

        android:layout_marginTop="@dimen/apps_row_app_icon_margin_vertical"

        android:layout_marginBottom="@dimen/apps_row_app_icon_margin_vertical"/>



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

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"

        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"

        android:textAppearance="@style/AppsItemText"

        android:textAppearance="@style/AppsRowTitle"

        android:maxLines="1"

        android:ellipsize="end"

        android:gravity="center"/>
@@ -49,8 +47,6 @@ 
        android:id="@+id/summary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"

        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"

        android:textAppearance="@style/AppsItemSubText"

        android:maxLines="1"

        android:ellipsize="end"

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

+12 −10
Original line number Diff line number Diff line
@@ -14,24 +14,26 @@ 
     limitations under the License.

-->



<!-- TODO(b/379776735): Remove this after use_material3 flag is launched.

    Currently it's being referenced in AppsRowManager.

-->

<LinearLayout

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

    android:id="@+id/apps_row"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/apps_row_background"

    android:layout_marginTop="@dimen/apps_row_margin_vertical"

    android:layout_marginBottom="@dimen/apps_row_margin_vertical"

    android:layout_marginStart="@dimen/apps_row_margin_horizontal"

    android:layout_marginEnd="@dimen/apps_row_margin_horizontal"

    android:padding="@dimen/apps_row_padding"

    android:orientation="vertical">



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/apps_row_title_height"

        android:paddingStart="@dimen/apps_row_title_padding_start"

        android:textAppearance="@style/SortTitle"

        android:layout_gravity="center_horizontal"

        android:layout_marginBottom="@dimen/apps_row_title_padding"

        android:textAppearance="@style/AppsRowTitle"

        android:text="@string/apps_row_title"

        android:textAllCaps="true"

        android:gravity="center" />



    <HorizontalScrollView