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

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

Snap for 12930767 from 60e78569 to 25Q2-release

Change-Id: Iba7bfbcfd361cbf1b275ff5a4171c377015b5fc6
parents a2c47ba3 60e78569
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
     limitations under the License.
-->

<!-- TODO(b/379776735): remove this file after M3 uplift -->
<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
     draws the whole height of the progress bar instead having blank space above and below the
     bar. -->
+4 −4
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <ProgressBar
    <com.google.android.material.progressindicator.LinearProgressIndicator
        android:id="@+id/progressbar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/progress_bar_height"
        android:layout_height="wrap_content"
        android:indeterminate="true"
        style="@style/TrimmedHorizontalProgressBar"
        app:trackColor="?attr/colorSecondaryContainer"
        android:visibility="gone" />

    <com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout
+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@
    <dimen name="zoom_icon_size">24dp</dimen>
    <dimen name="list_item_thumbnail_size">40dp</dimen>
    <dimen name="grid_item_icon_size">30dp</dimen>
    <!-- TODO(b/379776735): remove this after M3 uplift -->
    <dimen name="progress_bar_height">4dp</dimen>
    <fraction name="grid_scale_min">85%</fraction>
    <fraction name="grid_scale_max">200%</fraction>
+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@
        <item name="cardElevation">@dimen/grid_item_elevation</item>
    </style>

    <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
        <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
        <item name="android:minHeight">3dp</item>
        <item name="android:maxHeight">3dp</item>
    </style>

    <style name="SnackbarButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
        <item name="android:textColor">?android:colorPrimary</item>
    </style>
+5 −0
Original line number Diff line number Diff line
@@ -251,6 +251,11 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
        throw new UnsupportedOperationException("Can't open document.");
    }

    @Override
    public void openDocumentViewOnly(DocumentInfo doc) {
        throw new UnsupportedOperationException("Open doc not supported!");
    }

    @Override
    public void showInspector(DocumentInfo doc) {
        throw new UnsupportedOperationException("Can't open properties.");
Loading