Adding indirection for preference icon size

Also cleaned up the layout files to add indirection for vertical
padding and not use unnecessary private attribute resolution.

Fixes: 127764280
Test: manual
Change-Id: I5785d55186da4a39cd776e1f2ca3fa17e1b9480b

3 files changed, 17 insertions, 13 deletions

diff --git a/core/res/res/layout-car/car_preference.xml b/core/res/res/layout-car/car_preference.xml
index ae3d63bd2d6a..b138f4d7cf50 100644
--- a/core/res/res/layout-car/car_preference.xml
+++ b/core/res/res/layout-car/car_preference.xml
@@ -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">
diff --git a/core/res/res/layout-car/car_preference_category.xml b/core/res/res/layout-car/car_preference_category.xml
index d1f73421e185..b674487cffa7 100644
--- a/core/res/res/layout-car/car_preference_category.xml
+++ b/core/res/res/layout-car/car_preference_category.xml
@@ -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
diff --git a/core/res/res/values/dimens_car.xml b/core/res/res/values/dimens_car.xml
index f22a91ff75c1..880f9ccebd6e 100644
--- a/core/res/res/values/dimens_car.xml
+++ b/core/res/res/values/dimens_car.xml
@@ -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>