Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Swap seekbar vert padding to keep height fixed" into rvc-qpr-dev am: a8ba5c742d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12673648

Change-Id: Id90653a795b9278134d3da4627889319a7ffcdcd
This commit is contained in:
TreeHugger Robot
2020-09-24 17:38:20 +00:00
committed by Automerger Merge Worker
parent bcd38eeb35 a8ba5c742d
commit 0a819c1dca
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/media_view.xml
View File

@@ -166,8 +166,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:maxHeight="@dimen/qs_media_enabled_seekbar_height" android:maxHeight="@dimen/qs_media_enabled_seekbar_height"
android:paddingTop="16dp" android:paddingVertical="@dimen/qs_media_enabled_seekbar_vertical_padding"
android:paddingBottom="16dp"
android:thumbTint="@color/media_primary_text" android:thumbTint="@color/media_primary_text"
android:progressTint="@color/media_seekbar_progress" android:progressTint="@color/media_seekbar_progress"
android:progressBackgroundTint="@color/media_disabled" android:progressBackgroundTint="@color/media_disabled"

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -1295,6 +1295,8 @@
<dimen name="qs_footer_horizontal_margin">22dp</dimen> <dimen name="qs_footer_horizontal_margin">22dp</dimen>
<dimen name="qs_media_disabled_seekbar_height">1dp</dimen> <dimen name="qs_media_disabled_seekbar_height">1dp</dimen>
<dimen name="qs_media_enabled_seekbar_height">3dp</dimen> <dimen name="qs_media_enabled_seekbar_height">3dp</dimen>
<dimen name="qs_media_enabled_seekbar_vertical_padding">15dp</dimen>
<dimen name="qs_media_disabled_seekbar_vertical_padding">16dp</dimen>
<dimen name="magnification_border_size">5dp</dimen> <dimen name="magnification_border_size">5dp</dimen>
<dimen name="magnification_frame_move_short">5dp</dimen> <dimen name="magnification_frame_move_short">5dp</dimen>

19
packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt
View File

@@ -28,10 +28,14 @@ import com.android.systemui.R
*/ */
class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarViewModel.Progress> { class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarViewModel.Progress> {
val seekBarDefaultMaxHeight = holder.seekBar.context.resources val seekBarEnabledMaxHeight = holder.seekBar.context.resources
.getDimensionPixelSize(R.dimen.qs_media_enabled_seekbar_height) .getDimensionPixelSize(R.dimen.qs_media_enabled_seekbar_height)
val seekBarDisabledHeight = holder.seekBar.context.resources val seekBarDisabledHeight = holder.seekBar.context.resources
.getDimensionPixelSize(R.dimen.qs_media_disabled_seekbar_height) .getDimensionPixelSize(R.dimen.qs_media_disabled_seekbar_height)
val seekBarEnabledVerticalPadding = holder.seekBar.context.resources
.getDimensionPixelSize(R.dimen.qs_media_enabled_seekbar_vertical_padding)
val seekBarDisabledVerticalPadding = holder.seekBar.context.resources
.getDimensionPixelSize(R.dimen.qs_media_disabled_seekbar_vertical_padding)
/** Updates seek bar views when the data model changes. */ /** Updates seek bar views when the data model changes. */
@UiThread @UiThread
@@ -39,6 +43,7 @@ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarVi
if (!data.enabled) { if (!data.enabled) {
if (holder.seekBar.maxHeight != seekBarDisabledHeight) { if (holder.seekBar.maxHeight != seekBarDisabledHeight) {
holder.seekBar.maxHeight = seekBarDisabledHeight holder.seekBar.maxHeight = seekBarDisabledHeight
setVerticalPadding(seekBarDisabledVerticalPadding)
} }
holder.seekBar.setEnabled(false) holder.seekBar.setEnabled(false)
holder.seekBar.getThumb().setAlpha(0) holder.seekBar.getThumb().setAlpha(0)
@@ -51,8 +56,9 @@ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarVi
holder.seekBar.getThumb().setAlpha(if (data.seekAvailable) 255 else 0) holder.seekBar.getThumb().setAlpha(if (data.seekAvailable) 255 else 0)
holder.seekBar.setEnabled(data.seekAvailable) holder.seekBar.setEnabled(data.seekAvailable)
if (holder.seekBar.maxHeight != seekBarDefaultMaxHeight) { if (holder.seekBar.maxHeight != seekBarEnabledMaxHeight) {
holder.seekBar.maxHeight = seekBarDefaultMaxHeight holder.seekBar.maxHeight = seekBarEnabledMaxHeight
setVerticalPadding(seekBarEnabledVerticalPadding)
} }
data.duration?.let { data.duration?.let {
@@ -67,4 +73,11 @@ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarVi
it / DateUtils.SECOND_IN_MILLIS)) it / DateUtils.SECOND_IN_MILLIS))
} }
} }
@UiThread
fun setVerticalPadding(padding: Int) {
val leftPadding = holder.seekBar.paddingLeft
val rightPadding = holder.seekBar.paddingRight
holder.seekBar.setPadding(leftPadding, padding, rightPadding, padding)
}
} }