Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev am: 83fcc3582e

am: 515d30f819

Change-Id: I514f789d2f96cdbf8806df1d185cf2430b702aa3

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

@@ -80,11 +80,6 @@ public class VolumeSeekBarPreference extends SeekBarPreference {
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
-    @Override
-    public boolean isSelectable() {
-        return false;
-    }
-
     public void setStream(int stream) {
         mStream = stream;
         setMax(mAudioManager.getStreamMaxVolume(mStream));

src/com/android/settings/widget/SeekBarPreference.java

@@ -93,7 +93,7 @@ public class SeekBarPreference extends RestrictedPreference
 
     @Override
     public boolean isSelectable() {
-        return false;
+        return isDisabledByAdmin();
     }
 
     @Override