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

Commit 55e46a8b authored by Garvita Jain's avatar Garvita Jain Committed by Android (Google) Code Review
Browse files

Merge "Use Linear progress indicator for storage progress bars" into main

parents e1028c45 cb33f276

res/drawable/storage_progress_bar.xml

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

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background">

        <shape>

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

            <solid android:color="@color/settingslib_materialColorSurfaceContainerHighest" />

        </shape>

    </item>

    <item android:id="@android:id/progress">

        <clip>

            <shape>

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

                <solid android:color="@color/settingslib_materialColorPrimary" />

            </shape>

        </clip>

    </item>

</layer-list>
 
 No newline at end of file

res/layout/storage_item.xml

+5 −3
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 
                app:layout_constraintBaseline_toBaselineOf="@android:id/title"

                app:layout_constraintEnd_toEndOf="parent"/>



            <ProgressBar

            <com.google.android.material.progressindicator.LinearProgressIndicator

                android:theme="@style/Theme.Material3.DynamicColors.DayNight"

                android:id="@android:id/progress"

                android:layout_width="match_parent"

                android:layout_height="@dimen/settingslib_expressive_space_extrasmall2"
@@ -74,8 +75,9 @@ 
                android:max="100"

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

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

                style="?android:attr/progressBarStyleHorizontal"

                android:progressDrawable="@drawable/storage_progress_bar" />

                app:trackThickness="@dimen/settingslib_expressive_space_extrasmall2"

                app:indicatorTrackGapSize="@dimen/settingslib_expressive_space_extrasmall2"

                style="@style/SettingsLibProgressBarStyle.Linear.Expressive" />

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>

</LinearLayout>