PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 85315533: Settings: Performance tweaks for SeekBarVolumizer.

Browse Source 
* commit '85315533a19aa61a0c5fc27d3f783c3f21e3878f':
  Settings: Performance tweaks for SeekBarVolumizer.
This commit is contained in:
John Spurlock
2014-05-27 18:03:48 +00:00
committed by Android Git Automerger
parent 416d11b4a9 85315533a1
commit 70f64b7509
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/RingerVolumePreference.java
View File

@@ -173,11 +173,13 @@ public class RingerVolumePreference extends VolumePreference {
SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]); SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
mSeekBars[i] = seekBar; mSeekBars[i] = seekBar;
if (SEEKBAR_TYPE[i] == AudioManager.STREAM_MUSIC) { if (SEEKBAR_TYPE[i] == AudioManager.STREAM_MUSIC) {
mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar, mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(),
SEEKBAR_TYPE[i], getMediaVolumeUri(getContext()), this); SEEKBAR_TYPE[i], getMediaVolumeUri(getContext()), this);
mSeekBarVolumizer[i].setSeekBar(seekBar);
} else { } else {
mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar, mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(),
SEEKBAR_TYPE[i], null, this); SEEKBAR_TYPE[i], null, this);
mSeekBarVolumizer[i].setSeekBar(seekBar);
} }
} }

6
src/com/android/settings/notification/VolumeSeekBarPreference.java
View File

@@ -34,7 +34,6 @@ import com.android.settings.R;
public class VolumeSeekBarPreference extends SeekBarPreference public class VolumeSeekBarPreference extends SeekBarPreference
implements PreferenceManager.OnActivityStopListener { implements PreferenceManager.OnActivityStopListener {
private static final String TAG = "VolumeSeekBarPreference"; private static final String TAG = "VolumeSeekBarPreference";
private final Context mContext; private final Context mContext;
private int mStream; private int mStream;
@@ -82,7 +81,10 @@ public class VolumeSeekBarPreference extends SeekBarPreference
} }
}; };
final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null; final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null;
mVolumizer = new SeekBarVolumizer(mContext, seekBar, mStream, sampleUri, sbvc); if (mVolumizer == null) {
mVolumizer = new SeekBarVolumizer(mContext, mStream, sampleUri, sbvc);
}
mVolumizer.setSeekBar(mSeekBar);
} }
private Uri getMediaVolumeUri() { private Uri getMediaVolumeUri() {