From 22cc6e97591c8978e3f28bf6da6f94aa5a958ffa Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Wed, 8 Mar 2023 12:36:34 +0000 Subject: [PATCH] [Output Switcher] Adjust volume progress scale to decrease gap Adjust scale from volume to progress by increasing 500, when user adjust volume to 1551, close and open again, seekbar will be initialized to 1000, which will have 551 gap, after this change it will be adjusted to 1500, to decrease gap to 51. Bug: 264841237 Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest Change-Id: I61f95a79fb23065c8a767ea23be31c36a62db193 --- .../android/systemui/media/dialog/MediaOutputSeekbar.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSeekbar.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSeekbar.java index 253c3c7134853..be5d60799f790 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSeekbar.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSeekbar.java @@ -26,6 +26,7 @@ import android.widget.SeekBar; */ public class MediaOutputSeekbar extends SeekBar { private static final int SCALE_SIZE = 1000; + private static final int INITIAL_PROGRESS = 500; public static final int VOLUME_PERCENTAGE_SCALE_SIZE = 100000; public MediaOutputSeekbar(Context context, AttributeSet attrs) { @@ -38,7 +39,7 @@ public class MediaOutputSeekbar extends SeekBar { } static int scaleVolumeToProgress(int volume) { - return volume * SCALE_SIZE; + return volume == 0 ? 0 : INITIAL_PROGRESS + volume * SCALE_SIZE; } int getVolume() { @@ -46,7 +47,7 @@ public class MediaOutputSeekbar extends SeekBar { } void setVolume(int volume) { - setProgress(volume * SCALE_SIZE, true); + setProgress(scaleVolumeToProgress(volume), true); } void setMaxVolume(int maxVolume) {