Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a337505 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Set animation when update seekbar progress" into tm-dev am: ce285fe3 

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

Change-Id: I1075846ac721809d908cd41975b7ea0d60275d1f
parents 0d7c50fe ce285fe3

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ public abstract class MediaOutputBaseAdapter extends 
            mSeekBar.setMin(0);

            mSeekBar.setMin(0);

            final int currentVolume = device.getCurrentVolume();

            final int currentVolume = device.getCurrentVolume();

            if (mSeekBar.getProgress() != currentVolume) {

            if (mSeekBar.getProgress() != currentVolume) {

                mSeekBar.setProgress(currentVolume);

                mSeekBar.setProgress(currentVolume, true);

            }

            }

            mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

            mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

                @Override

                @Override
@@ -278,7 +278,7 @@ public abstract class MediaOutputBaseAdapter extends 
            mSeekBar.setMin(0);

            mSeekBar.setMin(0);

            final int currentVolume = mController.getSessionVolume();

            final int currentVolume = mController.getSessionVolume();

            if (mSeekBar.getProgress() != currentVolume) {

            if (mSeekBar.getProgress() != currentVolume) {

                mSeekBar.setProgress(currentVolume);

                mSeekBar.setProgress(currentVolume, true);

            }

            }

            mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

            mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

                @Override

                @Override