From f98fc73d6a67c34f5d756aff3dabc30aea8dec70 Mon Sep 17 00:00:00 2001
From: Dan Harms <danharms@google.com>
Date: Mon, 12 Aug 2019 17:40:21 -0700
Subject: Bring browse text colors to spec

Bug: 139199032
Test: Flash and observe subtitles are secondary color
Change-Id: I5d7377fb01d862fb8b3b94dfbff4251b2dc1a11c
---
 res/values/styles.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index cb0f4ad..896fb48 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,11 +61,17 @@
         <item name="android:layout_marginHorizontal">@dimen/fragment_metadata_margin_x</item>
     </style>
 
-    <style name="BrowseSubheaderStyle" parent="TextAppearance.Body3"/>
+    <style name="BrowseSubheaderStyle" parent="TextAppearance.Body3">
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
     <style name="BrowseListTitleStyle" parent="TextAppearance.Body1"/>
-    <style name="BrowseListSubtitleStyle" parent="TextAppearance.Body3"/>
+    <style name="BrowseListSubtitleStyle" parent="TextAppearance.Body3">
+        <item name="android:textColor">@color/secondary_text_color</item>
+    </style>
     <style name="BrowseGridTitleStyle" parent="TextAppearance.Body2"/>
-    <style name="BrowseGridSubtitleStyle" parent="TextAppearance.Body3"/>
+    <style name="BrowseGridSubtitleStyle" parent="TextAppearance.Body3">
+        <item name="android:textColor">@color/secondary_text_color</item>
+    </style>
 
     <style name="ErrorTextStyle" parent="TextAppearance.Body3"/>
     <style name="ErrorButtonStyle" parent="TextAppearance.Body3">
-- 
cgit v1.2.3


From d430d443e0cb279a30cc0d9edff86eee8d68284e Mon Sep 17 00:00:00 2001
From: Arnaud Berry <arnaudberry@google.com>
Date: Tue, 20 Aug 2019 14:46:31 -0700
Subject: Reduce jank when drilling into a media item

Fixes: 131270221
Bug: 139759881

Test: manual
Change-Id: I5fec40fccfbffd86e5cdc53b8c412cf632633645
---
 src/com/android/car/media/BrowseFragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/car/media/BrowseFragment.java b/src/com/android/car/media/BrowseFragment.java
index bc8eb15..488dab4 100644
--- a/src/com/android/car/media/BrowseFragment.java
+++ b/src/com/android/car/media/BrowseFragment.java
@@ -266,7 +266,8 @@ public class BrowseFragment extends Fragment {
             }
             boolean isLoading = futureData.isLoading();
             if (isLoading) {
-                ViewUtils.hideViewAnimated(mBrowseList, mFadeDuration);
+                // TODO(b/139759881) build a jank-free animation of the transition.
+                mBrowseList.setAlpha(0f);
                 startLoadingIndicator();
                 mBrowseAdapter.submitItems(null, null);
                 return;
-- 
cgit v1.2.3


From 533dfd879a1f9c45756595424a579782e4005e23 Mon Sep 17 00:00:00 2001
From: Simon Dai <sdai@google.com>
Date: Tue, 20 Aug 2019 17:12:11 -0700
Subject: Fix alignment of title in app bar

Fixes: 139754729
Test: Manual
Change-Id: I9e33425abd4833b54a6e5c513f17fea1c5b62ae4
---
 res/layout/appbar_view.xml | 2 +-
 res/values/dimens.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/appbar_view.xml b/res/layout/appbar_view.xml
index 232db86..9fee45b 100644
--- a/res/layout/appbar_view.xml
+++ b/res/layout/appbar_view.xml
@@ -102,7 +102,7 @@
     <TextView
         android:id="@+id/title"
         style="@style/AppBarTitleStyle"
-        android:layout_marginStart="@dimen/appbar_view_title_margin_start"
+        app:layout_goneMarginStart="@dimen/appbar_view_title_margin_start"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/row_separator"
         app:layout_constraintStart_toEndOf="@id/nav_icon_container"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index beb99b6..0af911e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -77,7 +77,7 @@
     <dimen name="appbar_view_tabs_margin_end">@*android:dimen/car_padding_3</dimen>
     <dimen name="appbar_view_control_buttons_spacing">@*android:dimen/car_padding_3</dimen>
     <dimen name="appbar_view_control_buttons_margin_end">@*android:dimen/car_padding_2</dimen>
-    <dimen name="appbar_view_title_margin_start">@*android:dimen/car_padding_2</dimen>
+    <dimen name="appbar_view_title_margin_start">@dimen/appbar_view_nav_button_width</dimen>
 
     <!-- browse_state.xml -->
     <dimen name="browse_state_progress_height">@*android:dimen/car_double_line_list_item_height
-- 
cgit v1.2.3