Bring browse items to spec
Fixes: 139199032
Test: Flash and inspect views
Change-Id: I0c148469a8af22f2f9a03b22feccd0bacbc37f61
diff --git a/res/layout/media_browse_grid_item.xml b/res/layout/media_browse_grid_item.xml
index 4f4450e..9b49d8a 100644
--- a/res/layout/media_browse_grid_item.xml
+++ b/res/layout/media_browse_grid_item.xml
@@ -20,7 +20,6 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/media_browse_grid_item_padding"
android:focusable="true"
android:clickable="true"
android:foreground="@drawable/grid_item_background"
@@ -65,6 +64,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/media_browse_grid_item_text_margin_top"
android:singleLine="true"
+ android:includeFontPadding="false"
android:duplicateParentState="true"
app:layout_constraintStart_toEndOf="@+id/explicit_icon_with_title"
app:layout_constraintTop_toBottomOf="@+id/thumbnail"
@@ -97,7 +97,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
+ android:includeFontPadding="false"
android:duplicateParentState="true"
+ android:layout_marginTop="@dimen/media_browse_subtitle_margin_top"
app:layout_constraintTop_toBottomOf="@+id/title"
app:layout_constraintStart_toEndOf="@+id/explicit_icon_with_subtitle"
app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/res/layout/media_browse_list_item.xml b/res/layout/media_browse_list_item.xml
index 5e3e28f..026f7f4 100644
--- a/res/layout/media_browse_list_item.xml
+++ b/res/layout/media_browse_list_item.xml
@@ -22,15 +22,13 @@
android:layout_height="@dimen/media_browse_list_item_height"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground">
- <ImageView
+ <com.android.car.media.common.FixedRatioImageView
android:id="@+id/thumbnail"
- android:layout_width="@dimen/media_browse_list_item_thumbnail_size"
- android:layout_height="@dimen/media_browse_list_item_thumbnail_size"
- android:layout_marginStart="@dimen/media_browse_list_item_icon_margin_start"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
android:scaleType="centerCrop"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"/>
+ android:layout_marginBottom="@dimen/media_browse_list_item_thumbnail_margin_bottom"
+ app:aspect_ratio="1"/>
<!-- This guideline is necessary because there are icons preceding the text which typically have
visibility GONE, which prevents margins applied to the leftmost view from applying to the
@@ -69,8 +67,8 @@
style="@style/BrowseListTitleStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:includeFontPadding="false"
android:singleLine="true"
+ android:includeFontPadding="false"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/subtitle"
@@ -104,7 +102,6 @@
style="@style/BrowseListSubtitleStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:includeFontPadding="false"
android:singleLine="true"
app:layout_constraintTop_toBottomOf="@+id/title"
app:layout_constraintBottom_toBottomOf="parent"
@@ -116,8 +113,10 @@
android:src="@drawable/ic_chevron_right"
android:layout_width="@dimen/media_browse_list_item_arrow_size"
android:layout_height="@dimen/media_browse_list_item_arrow_size"
+ android:layout_marginTop="@dimen/media_browse_subtitle_margin_top"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"
+ android:includeFontPadding="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4229bf7..af1fae5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,13 +91,14 @@
<!-- BrowseFragment.java -->
<!-- Spacer used between the app bar and the top of the browse list/grid -->
<dimen name="browse_spacer_height">@*android:dimen/car_padding_2</dimen>
- <dimen name="grid_item_spacing">@*android:dimen/car_padding_4</dimen>
- <dimen name="grid_item_margin_x">0dp</dimen>
+ <dimen name="grid_item_spacing">@*android:dimen/car_padding_3</dimen>
+
+ <!-- Space between title and subtitle on media browse list/grid -->
+ <dimen name="media_browse_subtitle_margin_top">@*android:dimen/car_padding_0</dimen>
<!-- media_browse_grid_item.xml -->
<dimen name="media_browse_grid_item_margin_bottom">@*android:dimen/car_padding_4</dimen>
<dimen name="media_browse_grid_item_text_margin_top">@*android:dimen/car_padding_3</dimen>
- <dimen name="media_browse_grid_item_padding">12dp</dimen>
<dimen name="media_browse_grid_item_background_radius">4dp</dimen>
<!-- media_browse_header_item.xml -->
@@ -109,7 +110,8 @@
<dimen name="media_browse_list_item_thumbnail_size">76dp</dimen>
<dimen name="media_browse_list_item_text_margin_x">@*android:dimen/car_keyline_4</dimen>
<dimen name="media_browse_list_item_icon_margin_start">@*android:dimen/car_keyline_1</dimen>
- <dimen name="media_browse_list_item_arrow_size">@dimen/touch_target_size</dimen>
+ <dimen name="media_browse_list_item_arrow_size">@*android:dimen/car_primary_icon_size</dimen>
+ <dimen name="media_browse_list_item_thumbnail_margin_bottom">1dp</dimen>
<!-- media_browse_panel_item.xml -->
<dimen name="media_browse_panel_item_height">@*android:dimen/car_single_line_list_item_height
diff --git a/src/com/android/car/media/BrowseFragment.java b/src/com/android/car/media/BrowseFragment.java
index 3759ac8..bc8eb15 100644
--- a/src/com/android/car/media/BrowseFragment.java
+++ b/src/com/android/car/media/BrowseFragment.java
@@ -240,10 +240,7 @@
mBrowseList.setLayoutManager(gridLayoutManager);
mBrowseList.addItemDecoration(new GridSpacingItemDecoration(
- getResources().getDimensionPixelSize(R.dimen.grid_item_spacing),
- getResources().getDimensionPixelSize(R.dimen.grid_item_margin_x),
- getResources().getDimensionPixelSize(R.dimen.grid_item_margin_x)
- ));
+ getResources().getDimensionPixelSize(R.dimen.grid_item_spacing)));
mBrowseAdapter = new BrowseAdapter(mBrowseList.getContext());
mBrowseList.setAdapter(mBrowseAdapter);
