diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-21 21:02:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-21 21:02:48 +0000 |
| commit | ec5ef2bf9267d1788a6b3f547d2a80200adc3cb2 (patch) | |
| tree | c3711e822c0ec7bdc782590cd92a6a5fcad3165a | |
| parent | daa2a437517039ffcc6658274e8930fb9a50ed59 (diff) | |
| parent | 95581269201e94c4b33652cb3721de3655aca877 (diff) | |
| download | Media-android10-c2f2-s1-release.tar.gz | |
Snap for 5820048 from 95581269201e94c4b33652cb3721de3655aca877 to qt-c2f2-releaseandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Change-Id: I7d65ce61b142f252f5dd496881afa5348a5486f7
| -rw-r--r-- | res/layout/appbar_view.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 12 | ||||
| -rw-r--r-- | src/com/android/car/media/BrowseFragment.java | 3 |
4 files changed, 13 insertions, 6 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 05c05f3..87b0183 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 diff --git a/res/values/styles.xml b/res/values/styles.xml index a01a571..ec4a58b 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.Body1"/> 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; |