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

Commit 3fea3c4c authored by Austin Tankiang's avatar Austin Tankiang Committed by Android (Google) Code Review
Browse files

Merge "Add the job progress panel" into main

parents bde3eb49 4332f355

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
  int dir_menu_view_in_owner;

  int drawer_layout;

  int inspector_details_view;

  int job_progress_panel_title;

  int option_menu_create_dir;

  int option_menu_debug;

  int option_menu_extract_all;

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

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

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <com.google.android.material.card.MaterialCardView

        style="@style/JobProgressPanelStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:id="@+id/job_progress_panel_title"

                android:text="@string/job_progress_panel_title"

                android:textAppearance="@style/JobProgressPanelHeaderText"

                android:layout_margin="@dimen/job_progress_panel_header_margin" />

            <androidx.recyclerview.widget.RecyclerView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:id="@+id/job_progress_list" />

        </LinearLayout>

    </com.google.android.material.card.MaterialCardView>

</FrameLayout>

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

+4 −0
Original line number Diff line number Diff line
@@ -248,4 +248,8 @@ 
    <dimen name="focus_ring_gap">5dp</dimen>

    <dimen name="hover_overlay_alpha">0.08</dimen>

    <dimen name="ripple_overlay_alpha">0.10</dimen>



    <dimen name="job_progress_panel_width">360dp</dimen>

    <dimen name="job_progress_panel_margin">@dimen/space_small_1</dimen>

    <dimen name="job_progress_panel_header_margin">@dimen/space_small_1</dimen>

</resources>

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

+7 −0
Original line number Diff line number Diff line
@@ -190,4 +190,11 @@ 
        <item name="android:textColor">@color/nav_rail_item_text_color</item>

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

    </style>



    <style name="JobProgressPanelStyle" parent="@style/Widget.Material3.CardView.Elevated">

        <item name="android:layout_marginStart">@dimen/job_progress_panel_margin</item>

        <item name="android:layout_marginBottom">@dimen/job_progress_panel_margin</item>

        <item name="cardElevation">1dp</item>

        <item name="cardBackgroundColor">?attr/colorSurfaceDim</item>

    </style>

</resources>

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

+4 −0
Original line number Diff line number Diff line
@@ -159,4 +159,8 @@ 
        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



    <style name="JobProgressPanelHeaderText" parent="@style/TextAppearance.Material3.TitleMedium">

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



</resources>