diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-19 03:13:31 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-19 03:13:31 +0000 |
| commit | 4e755b6849911879715f617cc27078cc6f66deef (patch) | |
| tree | b48a5b8723e5c0ac172daa2c83d588fa894fecd9 | |
| parent | 227a0a67c0aa28ca0b86412595283a0c5baa4234 (diff) | |
| parent | c988ad3a222fe818dcb4e57a126d6d9168deb254 (diff) | |
| download | Media-4e755b6849911879715f617cc27078cc6f66deef.tar.gz | |
Snap for 5671254 from c988ad3a222fe818dcb4e57a126d6d9168deb254 to qt-release
Change-Id: I84d44adfdb8a1e8452275780ddbf42141f8175a8
| -rw-r--r-- | res/layout/media_browse_list_item.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | src/com/android/car/media/MediaActivity.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/res/layout/media_browse_list_item.xml b/res/layout/media_browse_list_item.xml index 8633e36..5e3e28f 100644 --- a/res/layout/media_browse_list_item.xml +++ b/res/layout/media_browse_list_item.xml @@ -26,7 +26,7 @@ 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_marginBottom="@dimen/media_browse_list_item_icon_margin_bottom" + android:layout_marginStart="@dimen/media_browse_list_item_icon_margin_start" android:scaleType="centerCrop" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 7f29d38..f373b68 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -106,9 +106,9 @@ <!-- media_browse_list_item.xml --> <dimen name="media_browse_list_item_height">116dp</dimen> - <dimen name="media_browse_list_item_thumbnail_size">112dp</dimen> + <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_bottom">4dp</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> <!-- media_browse_panel_item.xml --> diff --git a/src/com/android/car/media/MediaActivity.java b/src/com/android/car/media/MediaActivity.java index 1160ad2..942c2d6 100644 --- a/src/com/android/car/media/MediaActivity.java +++ b/src/com/android/car/media/MediaActivity.java @@ -313,10 +313,10 @@ public class MediaActivity extends FragmentActivity implements BrowseFragment.Ca MediaConstants.ERROR_RESOLUTION_ACTION_LABEL); String displayedMessage = null; - if (state.getErrorMessage() != null) { + if (!TextUtils.isEmpty(state.getErrorMessage())) { displayedMessage = state.getErrorMessage().toString(); } else if (state.getErrorCode() != PlaybackStateCompat.ERROR_CODE_UNKNOWN_ERROR) { - // TODO: convert the error codes to prebuilt error messages + // TODO(b/131601881): convert the error codes to prebuilt error messages displayedMessage = getString(R.string.default_error_message); } else if (state.getState() == PlaybackStateCompat.STATE_ERROR) { displayedMessage = getString(R.string.default_error_message); |