diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-05 07:24:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-05 07:24:27 +0000 |
commit | 566417d43295a909d3e7bc5dd575b4518f86ea2d (patch) | |
tree | 49efd79f6c1205cb6792590672f6a8dce921dbf5 | |
parent | 823793b225e6489d815466d0cc8f4dfc89f57c11 (diff) | |
parent | 87e45c576da73cbb7faa2741b19183d321bec5ac (diff) | |
download | Media-566417d43295a909d3e7bc5dd575b4518f86ea2d.tar.gz |
Snap for 4821244 from 87e45c576da73cbb7faa2741b19183d321bec5ac to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
Change-Id: Ifa7135a5660e3f2d08860c72beaf3034fe3a8841
-rw-r--r-- | src/com/android/car/media/MediaActivity.java | 1 | ||||
-rw-r--r-- | src/com/android/car/media/MetadataController.java | 12 |
2 files changed, 8 insertions, 5 deletions
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 @@ public class MediaActivity extends CarDrawerActivity implements BrowseFragment.C setMainContent(R.layout.media_activity); setToolbarElevation(0f); - setToolbarClickThrough(true); mContentForwardBrowseEnabled = getResources() .getBoolean(R.bool.forward_content_browse_enabled); 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 @@ package com.android.car.media; 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 @@ public class MetadataController { 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); } |