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

Commit 0f0a12cc authored by John Choi's avatar John Choi Committed by Android (Google) Code Review
Browse files

Merge "Adding indirection for preference icon size" into qt-dev

parents 51cdec53 c2171aaa

core/res/res/layout-car/car_preference.xml

+6 −6
Original line number Diff line number Diff line
@@ -27,20 +27,20 @@ 


    <com.android.internal.widget.PreferenceImageView

        android:id="@id/icon"

        android:layout_width="@*android:dimen/car_primary_icon_size"

        android:layout_height="@*android:dimen/car_primary_icon_size"

        android:layout_width="@dimen/car_preference_icon_size"

        android:layout_height="@dimen/car_preference_icon_size"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_marginBottom="@*android:dimen/car_padding_2"

        android:layout_marginBottom="@dimen/car_preference_row_vertical_margin"

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

        android:layout_marginTop="@android:dimen/car_padding_2"/>

        android:layout_marginTop="@dimen/car_preference_row_vertical_margin"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_marginBottom="@*android:dimen/car_padding_2"

        android:layout_marginTop="@*android:dimen/car_padding_2"

        android:layout_marginBottom="@dimen/car_preference_row_vertical_margin"

        android:layout_marginTop="@dimen/car_preference_row_vertical_margin"

        android:layout_toEndOf="@id/icon"

        android:layout_toStartOf="@id/widget_frame"

        android:orientation="vertical">

core/res/res/layout-car/car_preference_category.xml

+7 −7
Original line number Diff line number Diff line
@@ -22,25 +22,25 @@ 
    android:background="?android:attr/selectableItemBackground"

    android:focusable="true"

    android:gravity="center_vertical"

    android:minHeight="@*android:dimen/car_card_header_height"

    android:minHeight="@dimen/car_card_header_height"

    android:orientation="horizontal"

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

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



    <com.android.internal.widget.PreferenceImageView

        android:id="@id/icon"

        android:layout_width="@*android:dimen/car_primary_icon_size"

        android:layout_height="@*android:dimen/car_primary_icon_size"

        android:layout_width="@dimen/car_preference_category_icon_size"

        android:layout_height="@dimen/car_preference_category_icon_size"

        android:layout_gravity="center_vertical"

        android:layout_marginBottom="@dimen/car_padding_2"

        android:layout_marginBottom="@dimen/car_preference_row_vertical_margin"

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

        android:layout_marginTop="@*android:dimen/car_padding_2"/>

        android:layout_marginTop="@dimen/car_preference_row_vertical_margin"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@*android:dimen/car_padding_2"

        android:layout_marginTop="@*android:dimen/car_padding_2"

        android:layout_marginBottom="@dimen/car_preference_row_vertical_margin"

        android:layout_marginTop="@dimen/car_preference_row_vertical_margin"

        android:orientation="vertical">



        <TextView

core/res/res/values/dimens_car.xml

+4 −0
Original line number Diff line number Diff line
@@ -137,4 +137,8 @@ 
    <!-- Dialog image margin start -->

    <dimen name="image_margin_start">@*android:dimen/car_keyline_1</dimen>



    <dimen name="car_preference_icon_size">@dimen/car_primary_icon_size</dimen>

    <dimen name="car_preference_category_icon_size">@dimen/car_primary_icon_size</dimen>

    <dimen name="car_preference_row_vertical_margin">@dimen/car_padding_2</dimen>



</resources>