commit 566417d43295a909d3e7bc5dd575b4518f86ea2d
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 05 07:24:27 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 05 07:24:27 2018 +0000
tree 49efd79f6c1205cb6792590672f6a8dce921dbf5
parent 823793b225e6489d815466d0cc8f4dfc89f57c11
parent 87e45c576da73cbb7faa2741b19183d321bec5ac

Snap for 4821244 from 87e45c576da73cbb7faa2741b19183d321bec5ac to pi-release

Change-Id: Ifa7135a5660e3f2d08860c72beaf3034fe3a8841

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 762a4fe..6f01c62 100644
--- a/src/com/android/car/media/MediaActivity.java
+++ b/src/com/android/car/media/MediaActivity.java
@@ -231,7 +231,6 @@
 
         setMainContent(R.layout.media_activity);
         setToolbarElevation(0f);
-        setToolbarClickThrough(true);
 
         mContentForwardBrowseEnabled = getResources()
                 .getBoolean(R.bool.forward_content_browse_enabled);

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

diff --git a/src/com/android/car/media/MetadataController.java b/src/com/android/car/media/MetadataController.java
index e7261f5..59e4d9d 100644
--- a/src/com/android/car/media/MetadataController.java
+++ b/src/com/android/car/media/MetadataController.java
@@ -2,6 +2,8 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.media.session.PlaybackState;
+import android.support.v4.media.session.PlaybackStateCompat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.SeekBar;
@@ -146,17 +148,19 @@
             return;
         }
         long maxProgress = mModel.getMaxProgress();
-        int visibility = maxProgress > 0 ? View.VISIBLE : View.INVISIBLE;
+        long progress = mModel.getProgress();
+        int visibility = maxProgress > 0 && progress != PlaybackState.PLAYBACK_POSITION_UNKNOWN
+                ? View.VISIBLE : View.INVISIBLE;
         if (mTime != null) {
             String time = String.format("%s / %s",
-                    TIME_FORMAT.format(new Date(mModel.getProgress())),
+                    TIME_FORMAT.format(new Date(progress)),
                     TIME_FORMAT.format(new Date(maxProgress)));
             mTime.setVisibility(visibility);
             mTime.setText(time);
         }
         mSeekBar.setVisibility(visibility);
-        mSeekBar.setMax((int) mModel.getMaxProgress());
-        mSeekBar.setProgress((int) mModel.getProgress());
+        mSeekBar.setMax((int) maxProgress);
+        mSeekBar.setProgress((int) progress);
     }