summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-27 13:12:35 -0400
committerJohn Spurlock <jspurlock@google.com>2014-05-27 13:12:35 -0400
commit85315533a19aa61a0c5fc27d3f783c3f21e3878f (patch)
treee1e2da8eac0db6bb6dfc901ce71f8fa637d9aa73 /src/com/android
parent85ba0ee6ec978b760720f1ece3e8e64e0340d260 (diff)
downloadpackages_apps_Settings-85315533a19aa61a0c5fc27d3f783c3f21e3878f.tar.gz
packages_apps_Settings-85315533a19aa61a0c5fc27d3f783c3f21e3878f.tar.bz2
packages_apps_Settings-85315533a19aa61a0c5fc27d3f783c3f21e3878f.zip
Settings: Performance tweaks for SeekBarVolumizer.
Bind to existing volumizer instance when possible. Bug:15091992 Change-Id: I26248967ff85fdb7a850451336d6850e508d4f18
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/RingerVolumePreference.java6
-rw-r--r--src/com/android/settings/notification/VolumeSeekBarPreference.java6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 0f28e0608..313c1c0ae 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -173,11 +173,13 @@ public class RingerVolumePreference extends VolumePreference {
SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
mSeekBars[i] = seekBar;
if (SEEKBAR_TYPE[i] == AudioManager.STREAM_MUSIC) {
- mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+ mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(),
SEEKBAR_TYPE[i], getMediaVolumeUri(getContext()), this);
+ mSeekBarVolumizer[i].setSeekBar(seekBar);
} else {
- mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+ mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(),
SEEKBAR_TYPE[i], null, this);
+ mSeekBarVolumizer[i].setSeekBar(seekBar);
}
}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 5b0621d87..98891238e 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -34,7 +34,6 @@ import com.android.settings.R;
public class VolumeSeekBarPreference extends SeekBarPreference
implements PreferenceManager.OnActivityStopListener {
private static final String TAG = "VolumeSeekBarPreference";
-
private final Context mContext;
private int mStream;
@@ -82,7 +81,10 @@ public class VolumeSeekBarPreference extends SeekBarPreference
}
};
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() {