commit af762b333bcceeb2bfe6fb280f009158430089fe
author Marco Nelissen <marcone@google.com> Thu Oct 11 17:54:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 11 17:54:15 2012 -0700
tree 8dd1241ae59253db157f0f545a574ac20263aee6
parent 7894d07546a34846a218de9e099aea5248b9f5e4
parent 1c9259eb99450fbfdbbea8c82b79c46d339179b7

am 1c9259eb: Support virtualizers that aren\'t headphone-only.

* commit '1c9259eb99450fbfdbbea8c82b79c46d339179b7':
  Support virtualizers that aren't headphone-only.

src/com/android/musicfx/ActivityMusic.java

diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index b130b0b..0d14729 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -59,6 +59,7 @@
 
 import java.util.Formatter;
 import java.util.Locale;
+import java.util.UUID;
 
 /**
  *
@@ -75,6 +76,7 @@
      * Indicates if Virtualizer effect is supported.
      */
     private boolean mVirtualizerSupported;
+    private boolean mVirtualizerIsHeadphoneOnly;
     /**
      * Indicates if BassBoost effect is supported.
      */
@@ -248,6 +250,9 @@
 
             if (effect.type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
                 mVirtualizerSupported = true;
+                if (effect.uuid.equals(UUID.fromString("1d4033c0-8557-11df-9f2d-0002a5d5c51b"))) {
+                    mVirtualizerIsHeadphoneOnly = true;
+                }
             } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
                 mBassBoostSupported = true;
             } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)) {
@@ -581,9 +586,11 @@
      */
     private void updateUIHeadset() {
         if (mToggleSwitch.isChecked()) {
-            ((TextView) findViewById(R.id.vIStrengthText)).setEnabled(mIsHeadsetOn);
-            ((SeekBar) findViewById(R.id.vIStrengthSeekBar)).setEnabled(mIsHeadsetOn);
-            findViewById(R.id.vILayout).setEnabled(!mIsHeadsetOn);
+            ((TextView) findViewById(R.id.vIStrengthText)).setEnabled(
+                    mIsHeadsetOn || !mVirtualizerIsHeadphoneOnly);
+            ((SeekBar) findViewById(R.id.vIStrengthSeekBar)).setEnabled(
+                    mIsHeadsetOn || !mVirtualizerIsHeadphoneOnly);
+            findViewById(R.id.vILayout).setEnabled(!mIsHeadsetOn || !mVirtualizerIsHeadphoneOnly);
             ((TextView) findViewById(R.id.bBStrengthText)).setEnabled(mIsHeadsetOn);
             ((SeekBar) findViewById(R.id.bBStrengthSeekBar)).setEnabled(mIsHeadsetOn);
             findViewById(R.id.bBLayout).setEnabled(!mIsHeadsetOn);