diff options
| author | 2018-08-16 16:05:49 -0700 | |
|---|---|---|
| committer | 2018-08-16 16:09:48 -0700 | |
| commit | ca97fe0092666214f79385f61fcb5f34b594c84c (patch) | |
| tree | d599fadc55e222394e00e1bf83b99e3a173c702b | |
| parent | ce5035882b79ad2dac1fec6537061d0345a8048c (diff) | |
Add option to not play sample in SeekBarVolumizer.
Bug: 78806021
Change-Id: Ib4d760aa092c606bdc1340c18dead88d4b7ddaee
| -rw-r--r-- | core/java/android/preference/SeekBarVolumizer.java | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/core/java/android/preference/SeekBarVolumizer.java b/core/java/android/preference/SeekBarVolumizer.java index 2a094bb2ed1c..c68b4fc14835 100644 --- a/core/java/android/preference/SeekBarVolumizer.java +++ b/core/java/android/preference/SeekBarVolumizer.java @@ -81,6 +81,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba private int mVolumeBeforeMute = -1; private int mRingerMode; private int mZenMode; + private boolean mPlaySample; private static final int MSG_SET_STREAM_VOLUME = 0; private static final int MSG_START_SAMPLE = 1; @@ -94,6 +95,15 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba private boolean mAllowRinger; public SeekBarVolumizer(Context context, int streamType, Uri defaultUri, Callback callback) { + this(context, streamType, defaultUri, callback, true); + } + + public SeekBarVolumizer( + Context context, + int streamType, + Uri defaultUri, + Callback callback, + boolean playSample) { mContext = context; mAudioManager = context.getSystemService(AudioManager.class); mNotificationManager = context.getSystemService(NotificationManager.class); @@ -116,6 +126,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba mOriginalStreamVolume = mAudioManager.getStreamVolume(mStreamType); mLastAudibleStreamVolume = mAudioManager.getLastAudibleStreamVolume(mStreamType); mMuted = mAudioManager.isStreamMute(mStreamType); + mPlaySample = playSample; if (mCallback != null) { mCallback.onMuted(mMuted, isZenMuted()); } @@ -190,13 +201,19 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba AudioManager.FLAG_SHOW_UI_WARNINGS); break; case MSG_START_SAMPLE: - onStartSample(); + if (mPlaySample) { + onStartSample(); + } break; case MSG_STOP_SAMPLE: - onStopSample(); + if (mPlaySample) { + onStopSample(); + } break; case MSG_INIT_SAMPLE: - onInitSample(); + if (mPlaySample) { + onInitSample(); + } break; default: Log.e(TAG, "invalid SeekBarVolumizer message: "+msg.what); |