commit 665488441761a0d6cae2498eff935de31a1a7f9f
author John Spurlock <jspurlock@google.com> Tue May 27 19:23:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 27 19:23:24 2014 +0000
tree f1600b0ddaed0432f81a643e1dd37240ec4d8a61
parent 85315533a19aa61a0c5fc27d3f783c3f21e3878f
parent 57c713d1d92f64a558115e5aff212ebc54a19151

Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev

src/com/android/settings/RingerVolumePreference.java

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 0f28e06..313c1c0 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -173,11 +173,13 @@
             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);
             }
         }
 

src/com/android/settings/notification/VolumeSeekBarPreference.java

diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 5b0621d..9889123 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -34,7 +34,6 @@
 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 @@
             }
         };
         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() {