commit 446ddb24082a3a06f33766d2deeb6be2c8855ba7
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 02 01:20:41 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 02 01:20:41 2019 +0000
tree 73d73dd544ac2ebfe2c188c6142c117a228882cb
parent f469208a2aca8794a148a8d2da589adeca3f3c49
parent d1161028daa9a10b6ada1525b12d6e93c3c40ff9

Snap for 5911975 from d1161028daa9a10b6ada1525b12d6e93c3c40ff9 to qt-qpr1-release

Change-Id: Ieaccbc987314cf10856ad61e84be405397333924

src/com/android/car/media/MediaActivity.java

diff --git a/src/com/android/car/media/MediaActivity.java b/src/com/android/car/media/MediaActivity.java
index 7b49b69..c3bef92 100644
--- a/src/com/android/car/media/MediaActivity.java
+++ b/src/com/android/car/media/MediaActivity.java
@@ -675,7 +675,7 @@
     @Override
     public void onPlayableItemClicked(MediaItemMetadata item) {
         mPlaybackController.stop();
-        mPlaybackController.playItem(item.getId());
+        mPlaybackController.playItem(item);
         boolean switchToPlayback = getResources().getBoolean(
                 R.bool.switch_to_playback_view_when_playable_item_is_clicked);
         if (switchToPlayback) {

src/com/android/car/media/widgets/AppBarView.java

diff --git a/src/com/android/car/media/widgets/AppBarView.java b/src/com/android/car/media/widgets/AppBarView.java
index cece12b..6706977 100644
--- a/src/com/android/car/media/widgets/AppBarView.java
+++ b/src/com/android/car/media/widgets/AppBarView.java
@@ -323,6 +323,7 @@
                 setShowTabs(false);
                 mTitle.setVisibility(View.GONE);
                 mSearchBar.showSearchBar(false);
+                mSearchButton.setVisibility(View.GONE);
                 showSettings(true);
                 mAppSelector.setVisibility(View.VISIBLE);
                 break;