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

Commit 0e588ea8 authored by John Spurlock's avatar John Spurlock
Browse files

Make SeekBarVolumizer restartable. 

Decouple start from constructor, making it possible to restart
once stopped.

Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
parent 9ca39d74

core/java/android/preference/SeekBarVolumizer.java

+19 −12
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
    }



    private final Context mContext;

    private final Handler mHandler;

    private final H mUiHandler = new H();

    private final Callback mCallback;

    private final Uri mDefaultUri;
@@ -55,8 +54,9 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
    private final int mStreamType;

    private final int mMaxStreamVolume;

    private final Receiver mReceiver = new Receiver();

    private final Observer mVolumeObserver;



    private Handler mHandler;

    private Observer mVolumeObserver;

    private int mOriginalStreamVolume;

    private Ringtone mRingtone;

    private int mLastProgress = -1;
@@ -75,16 +75,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

        mStreamType = streamType;

        mMaxStreamVolume = mAudioManager.getStreamMaxVolume(mStreamType);

        HandlerThread thread = new HandlerThread(TAG + ".CallbackHandler");

        thread.start();

        mHandler = new Handler(thread.getLooper(), this);

        mCallback = callback;

        mOriginalStreamVolume = mAudioManager.getStreamVolume(mStreamType);

        mVolumeObserver = new Observer(mHandler);

        mContext.getContentResolver().registerContentObserver(

                System.getUriFor(System.VOLUME_SETTINGS[mStreamType]),

                false, mVolumeObserver);

        mReceiver.setListening(true);

        if (defaultUri == null) {

            if (mStreamType == AudioManager.STREAM_RING) {

                defaultUri = Settings.System.DEFAULT_RINGTONE_URI;
@@ -95,7 +87,6 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
            }

        }

        mDefaultUri = defaultUri;

        mHandler.sendEmptyMessage(MSG_INIT_SAMPLE);

    }



    public void setSeekBar(SeekBar seekBar) {
@@ -173,11 +164,27 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
    }



    public void stop() {

        if (mHandler == null) return;  // already stopped

        postStopSample();

        mContext.getContentResolver().unregisterContentObserver(mVolumeObserver);

        mSeekBar.setOnSeekBarChangeListener(null);

        mReceiver.setListening(false);

        mSeekBar.setOnSeekBarChangeListener(null);

        mHandler.getLooper().quitSafely();

        mHandler = null;

        mVolumeObserver = null;

    }



    public void start() {

        if (mHandler != null) return;  // already started

        HandlerThread thread = new HandlerThread(TAG + ".CallbackHandler");

        thread.start();

        mHandler = new Handler(thread.getLooper(), this);

        mHandler.sendEmptyMessage(MSG_INIT_SAMPLE);

        mVolumeObserver = new Observer(mHandler);

        mContext.getContentResolver().registerContentObserver(

                System.getUriFor(System.VOLUME_SETTINGS[mStreamType]),

                false, mVolumeObserver);

        mReceiver.setListening(true);

    }



    public void revertVolume() {

core/java/android/preference/VolumePreference.java

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class VolumePreference extends SeekBarDialogPreference implements 


        final SeekBar seekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);

        mSeekBarVolumizer = new SeekBarVolumizer(getContext(), mStreamType, null, this);

        mSeekBarVolumizer.start();

        mSeekBarVolumizer.setSeekBar(seekBar);



        getPreferenceManager().registerOnActivityStopListener(this);