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

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

Merge "[Expressive Design] Migrate Storage settings pages" into main

parents 90feafb1 ff5b7ae4

res/drawable/storage_progress_bar.xml

0 → 100644
+17 −0
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="8dp" />

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

        </shape>

    </item>

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

        <clip>

            <shape>

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

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

            </shape>

        </clip>

    </item>

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

res/layout/storage_item.xml

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ 
                android:max="100"

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

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

                style="?android:attr/progressBarStyleHorizontal" />

                style="?android:attr/progressBarStyleHorizontal"

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

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>

</LinearLayout>

res/xml/storage_dashboard_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:icon="@drawable/ic_storage"

        android:order="3"

        settings:controller="com.android.settings.deviceinfo.storage.AutomaticStorageManagementSwitchPreferenceController"/>

    <com.android.settings.widget.CardPreference

    <com.android.settingslib.widget.CardPreference

        android:key="free_up_space"

        android:order="4"

        android:title="@string/storage_free_up_space_title"