Snap for 5911975 from d1161028daa9a10b6ada1525b12d6e93c3c40ff9 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release

Change-Id: Ieaccbc987314cf10856ad61e84be405397333924

2 files changed, 2 insertions, 1 deletions

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 @@ public class MediaActivity extends FragmentActivity implements BrowseFragment.Ca
     @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) {
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 @@ public class AppBarView extends ConstraintLayout {
                 setShowTabs(false);
                 mTitle.setVisibility(View.GONE);
                 mSearchBar.showSearchBar(false);
+                mSearchButton.setVisibility(View.GONE);
                 showSettings(true);
                 mAppSelector.setVisibility(View.VISIBLE);
                 break;