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

Commit 0a534892 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use a common style for custom preference icon layouts"

parents 7359c0d5 c2b0c7bf

res/layout/expand_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_container"

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

res/layout/preference_material_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_container"

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

res/layout/preference_small_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
              android:focusable="true" >



    <LinearLayout

        android:id="@android:id/icon_frame"

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

res/layout/preference_volume_slider.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/icon_container"

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="44dp"

res/layout/storage_item.xml

+8 −6
Original line number Diff line number Diff line
@@ -20,24 +20,26 @@ 
              android:orientation="vertical"

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

              android:gravity="center_vertical"

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

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

              android:paddingTop="16dip"

              android:paddingBottom="16dip"

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

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

              android:clipToPadding="false">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:orientation="horizontal">

        android:orientation="horizontal"

        android:clipToPadding="false"

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



        <LinearLayout

            android:id="@android:id/icon_frame"

            android:id="@+id/icon_frame"

            style="@style/preference_icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="start|center_vertical"

            android:minWidth="60dp"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingTop="4dp"
@@ -76,7 +78,7 @@ 
        android:id="@android:id/progress"

        android:layout_width="match_parent"

        android:layout_height="8dp"

        android:layout_marginStart="60dp"

        android:layout_marginStart="72dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:visibility="gone"