commit a042cbf653679af3208905178f58ea5ec035ae1d
author Baligh Uddin <baligh@google.com> Mon Mar 25 20:57:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 20:57:42 2013 +0000
tree 72e8ff7f8479070dec7f99e59bae7754a9524f42
parent 18e688bdd27b2e8821ec08c6775a0b0dae1b9f71
parent 1b51d62a32233854676ef926b0f31019d258b20e

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

src/com/android/settings/SoundSettings.java

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 931858c..28d93f1 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -145,6 +145,11 @@
             findPreference(KEY_RING_VOLUME).setDependency(null);
         }
 
+        if (getResources().getBoolean(com.android.internal.R.bool.config_useFixedVolume)) {
+            // device with fixed volume policy, do not display volumes submenu
+            getPreferenceScreen().removePreference(findPreference(KEY_RING_VOLUME));
+        }
+
         mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE);
         mVibrateWhenRinging.setPersistent(false);
         mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver,