From 8a9516d762bf520b4f32654e42893f4c96c734d7 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Fri, 19 Jun 2020 17:26:54 -0400
Subject: [PATCH] Make SeekBar 1dp tall when disabled

Test: manual
Fixes: 159369236

Change-Id: If28b65b66b78595d60a67e4f4c8deadf0393c1a0
---
 packages/SystemUI/res/layout/media_view.xml    |  2 +-
 packages/SystemUI/res/values/dimens.xml        |  2 ++
 .../android/systemui/media/SeekBarObserver.kt  | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/media_view.xml b/packages/SystemUI/res/layout/media_view.xml
index a722fbfce19aa..eeba04c5745a8 100644
--- a/packages/SystemUI/res/layout/media_view.xml
+++ b/packages/SystemUI/res/layout/media_view.xml
@@ -129,7 +129,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 9bcfdc43fbbff..d07c32c84b4a4 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1265,6 +1265,8 @@
     <dimen name="qs_seamless_icon_size">20dp</dimen>
     <dimen name="qqs_media_spacing">16dp</dimen>
     <dimen name="qs_footer_horizontal_margin">22dp</dimen>
+    <dimen name="qs_media_disabled_seekbar_height">1dp</dimen>
+    <dimen name="qs_media_enabled_seekbar_height">3dp</dimen>
 
     <dimen name="magnification_border_size">5dp</dimen>
     <dimen name="magnification_frame_move_short">5dp</dimen>
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<SeekBarViewModel.Progress> {
 
+    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<SeekBarVi
         holder.seekBar.getThumb().setAlpha(if (data.seekAvailable) 255 else 0)
         holder.seekBar.setEnabled(data.seekAvailable)
 
+        if (previouslyEnabled != holder.seekBar.isEnabled) {
+            holder.seekBar.maxHeight = if (holder.seekBar.isEnabled) {
+                seekBarDefaultMaxHeight
+            } else {
+                seekBarDisabledHeight
+            }
+        }
+
         data.elapsedTime?.let {
             holder.seekBar.setProgress(it)
             holder.elapsedTimeView.setText(DateUtils.formatElapsedTime(