Merge "Add option to not play sample in SeekBarVolumizer." (87c94c5b) · Commits · e / os / android_frameworks_base

core/java/android/preference/SeekBarVolumizer.java

+20 −3

Original line number	Diff line number	Diff line
		@@ -89,6 +89,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;
		@@ -103,6 +104,15 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba

		@UnsupportedAppUsage
		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);
		@@ -125,6 +135,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());
		}
		@@ -199,13 +210,19 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
		AudioManager.FLAG_SHOW_UI_WARNINGS);
		break;
		case MSG_START_SAMPLE:
		if (mPlaySample) {
		onStartSample();
		}
		break;
		case MSG_STOP_SAMPLE:
		if (mPlaySample) {
		onStopSample();
		}
		break;
		case MSG_INIT_SAMPLE:
		if (mPlaySample) {
		onInitSample();
		}
		break;
		default:
		Log.e(TAG, "invalid SeekBarVolumizer message: "+msg.what);