diff --git a/packages/SystemUI/res/layout/media_view.xml b/packages/SystemUI/res/layout/media_view.xml index c17b0c8580ca0..cc7ed1983214a 100644 --- a/packages/SystemUI/res/layout/media_view.xml +++ b/packages/SystemUI/res/layout/media_view.xml @@ -146,7 +146,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:clickable="true" - android:maxHeight="3dp" + android:maxHeight="@dimen/qs_media_enabled_seekbar_height" android:paddingTop="16dp" android:paddingBottom="16dp" android:thumbTint="@color/media_primary_text" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index df531a9c3e476..29a2ad4cba9fb 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1274,6 +1274,8 @@ 16dp 16dp 22dp + 1dp + 3dp 5dp 5dp diff --git a/packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt b/packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt index cd8ed265bd532..1b9bbddf61a18 100644 --- a/packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt @@ -19,6 +19,7 @@ package com.android.systemui.media import android.text.format.DateUtils import androidx.annotation.UiThread import androidx.lifecycle.Observer +import com.android.systemui.R /** * Observer for changes from SeekBarViewModel. @@ -27,11 +28,20 @@ import androidx.lifecycle.Observer */ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer { + val seekBarDefaultMaxHeight = holder.seekBar.context.resources + .getDimensionPixelSize(R.dimen.qs_media_enabled_seekbar_height) + val seekBarDisabledHeight = holder.seekBar.context.resources + .getDimensionPixelSize(R.dimen.qs_media_disabled_seekbar_height) + /** Updates seek bar views when the data model changes. */ @UiThread override fun onChanged(data: SeekBarViewModel.Progress) { + val previouslyEnabled = holder.seekBar.isEnabled if (!data.enabled) { holder.seekBar.setEnabled(false) + if (previouslyEnabled) { + holder.seekBar.maxHeight = seekBarDisabledHeight + } holder.seekBar.getThumb().setAlpha(0) holder.seekBar.setProgress(0) holder.elapsedTimeView.setText("") @@ -42,6 +52,14 @@ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer