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

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

Merge "[Expressive Design] Minor padding changes in screen layout" into main

parents 4a0c7825 3732b9b7

res/drawable/storage_progress_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

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

        <shape>

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

            <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="8dp" />

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

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

            </shape>

        </clip>

res/layout/storage_item.xml

+13 −13
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
              android:orientation="vertical"

              android:minHeight="?android:attr/listPreferredItemHeightSmall"

              android:gravity="center_vertical"

              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

              android:paddingTop="14dp"

              android:paddingBottom="14dp"

              android:background="?android:attr/selectableItemBackground"

              android:clipToPadding="false">
@@ -32,8 +29,11 @@ 
        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:orientation="horizontal"

        android:clipToPadding="false"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart">

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingTop="@dimen/settingslib_expressive_space_small3"

        android:paddingBottom="@dimen/settingslib_expressive_space_small3"

        android:clipToPadding="false">



        <include layout="@layout/settingslib_icon_frame"/>
@@ -43,11 +43,11 @@ 


            <TextView

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

                android:layout_width="0dp"

                android:layout_width="@dimen/settingslib_expressive_space_none"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

                android:textSize="20sp"

                android:textAppearance="?android:attr/textAppearanceListItem"

                android:textSize="16sp"

                android:textAlignment="viewStart"

                android:ellipsize="marquee"

                app:layout_constraintStart_toStartOf="parent"
@@ -58,8 +58,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"

                android:textSize="20sp"

                android:textAppearance="?android:attr/textAppearanceListItemSecondary"

                android:textSize="16sp"

                android:textColor="?android:attr/textColorSecondary"

                android:maxLines="10"

                app:layout_constraintBaseline_toBaselineOf="@android:id/title"
@@ -68,9 +68,9 @@ 
            <ProgressBar

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

                android:layout_width="match_parent"

                android:layout_height="4dp"

                android:layout_marginTop="12dp"

                android:layout_marginBottom="4dp"

                android:layout_height="@dimen/settingslib_expressive_space_extrasmall2"

                android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall4"

                android:layout_marginBottom="@dimen/settingslib_expressive_space_extrasmall2"

                android:max="100"

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

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

res/xml/app_storage_settings.xml

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ 
            android:selectable="false"

            android:layout="@layout/horizontal_preference" />



        <com.android.settings.applications.SpacePreference

            android:layout_height="8dp" />



    </PreferenceCategory>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory