Fixing metadata layout on playback screen.
Bug: 80150966
Test: Launched on Mojave
Change-Id: I307dbd386883e0b065cb3330e80a6e09219b674d
diff --git a/res/layout/fragment_metadata.xml b/res/layout/fragment_metadata.xml
index 4324681..7e0bf7d 100644
--- a/res/layout/fragment_metadata.xml
+++ b/res/layout/fragment_metadata.xml
@@ -25,7 +25,7 @@
android:id="@+id/album_art"
android:layout_width="@dimen/playback_album_art_size_normal"
android:layout_height="@dimen/playback_album_art_size_normal"
- android:layout_marginStart="@dimen/car_keyline_1"
+ android:layout_marginStart="@dimen/car_keyline_2"
android:contentDescription="@string/album_art"
android:background="@color/car_body1_light"
android:scaleType="centerCrop"
@@ -40,8 +40,8 @@
layout="@layout/metadata_normal"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/car_padding_4"
- android:layout_marginEnd="@dimen/car_keyline_1"
+ android:layout_marginStart="@dimen/car_padding_5"
+ android:layout_marginEnd="@dimen/car_keyline_2"
app:layout_constraintBottom_toBottomOf="@+id/album_art"
app:layout_constraintEnd_toEndOf="@+id/margin_end"
app:layout_constraintStart_toEndOf="@+id/album_art"
diff --git a/res/layout/media_activity.xml b/res/layout/media_activity.xml
index 050a9c8..97acbdb 100644
--- a/res/layout/media_activity.xml
+++ b/res/layout/media_activity.xml
@@ -32,8 +32,8 @@
android:id="@+id/media_scrim"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/browse_gradient_scrim"
- android:alpha="@dimen/media_scrim_darkened_alpha"/>
+ android:background="@color/album_art_scrim"
+ android:alpha="@dimen/album_art_scrim_alpha"/>
<FrameLayout
android:id="@+id/fragment_container"
diff --git a/res/layout/metadata_normal.xml b/res/layout/metadata_normal.xml
index c0e414e..903dc74 100644
--- a/res/layout/metadata_normal.xml
+++ b/res/layout/metadata_normal.xml
@@ -25,36 +25,35 @@
<TextView
android:id="@+id/title"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/car_padding_1"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="@integer/playback_title_text_max_lines"
android:textAppearance="@style/TextAppearance.Car.Body1.Light"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Body 1 Header"/>
<TextView
android:id="@+id/subtitle"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/car_padding_2"
- android:layout_marginTop="@dimen/car_padding_1"
+ android:layout_marginTop="@dimen/car_padding_0"
+ android:layout_marginEnd="@dimen/car_padding_5"
android:ellipsize="end"
- android:includeFontPadding="false"
android:maxLines="@integer/playback_subtitle_text_max_lines"
android:textAppearance="@style/TextAppearance.Car.Body2.Light"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/time"
app:layout_constraintTop_toBottomOf="@+id/title"
tools:text="Body 2"/>
<TextView
android:id="@+id/time"
android:layout_width="160dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/car_padding_1"
+ android:layout_marginTop="@dimen/car_padding_0"
android:ellipsize="end"
- android:includeFontPadding="false"
android:maxLines="@integer/playback_subtitle_text_max_lines"
android:gravity="end"
android:textAppearance="@style/TextAppearance.Car.Body2.Light"
@@ -63,9 +62,9 @@
tools:text="3:27 / 4:03"/>
<SeekBar
android:id="@+id/seek_bar"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/playback_seekbar_height"
- android:layout_marginTop="@dimen/car_padding_2"
+ android:layout_marginTop="@dimen/car_padding_4"
android:clickable="false"
android:focusable="false"
android:paddingEnd="0dp"
@@ -75,6 +74,7 @@
android:background="@null"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/subtitle"
tools:progress="70"
tools:visibility="visible"/>
