diff options
author | Marco Nelissen <marcone@google.com> | 2012-09-12 10:25:53 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 10:25:53 -0700 |
commit | a962d749ede478602ebff82d9dfab0482d5c6b54 (patch) | |
tree | a0705b55b12d7dba0132b65adb1afcd2c0a9c4e3 /media | |
parent | 048279126f3cbe62cab10007d58e2c751aaf20d0 (diff) | |
parent | 80cd3fcd5cdae6a2ea4a7c834d1df0dd79eb5b89 (diff) | |
download | frameworks_base-a962d749ede478602ebff82d9dfab0482d5c6b54.zip frameworks_base-a962d749ede478602ebff82d9dfab0482d5c6b54.tar.gz frameworks_base-a962d749ede478602ebff82d9dfab0482d5c6b54.tar.bz2 |
Merge "EffectsTest enhancements" into jb-mr1-dev
Diffstat (limited to 'media')
6 files changed, 34 insertions, 1 deletions
diff --git a/media/tests/EffectsTest/res/layout/bassboosttest.xml b/media/tests/EffectsTest/res/layout/bassboosttest.xml index 0888e98..ac912c8 100755 --- a/media/tests/EffectsTest/res/layout/bassboosttest.xml +++ b/media/tests/EffectsTest/res/layout/bassboosttest.xml @@ -105,6 +105,8 @@ style="@android:style/TextAppearance.Medium" /> <EditText android:id="@+id/sessionEdit" + android:singleLine="true" + android:numeric="integer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.5" diff --git a/media/tests/EffectsTest/res/layout/equalizertest.xml b/media/tests/EffectsTest/res/layout/equalizertest.xml index 2223c48..5ef035d 100755 --- a/media/tests/EffectsTest/res/layout/equalizertest.xml +++ b/media/tests/EffectsTest/res/layout/equalizertest.xml @@ -105,6 +105,8 @@ style="@android:style/TextAppearance.Medium" /> <EditText android:id="@+id/sessionEdit" + android:singleLine="true" + android:numeric="integer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.5" diff --git a/media/tests/EffectsTest/res/layout/presetreverbtest.xml b/media/tests/EffectsTest/res/layout/presetreverbtest.xml index b648899..cd7fbd3 100755 --- a/media/tests/EffectsTest/res/layout/presetreverbtest.xml +++ b/media/tests/EffectsTest/res/layout/presetreverbtest.xml @@ -105,6 +105,8 @@ style="@android:style/TextAppearance.Medium" /> <EditText android:id="@+id/sessionEdit" + android:singleLine="true" + android:numeric="integer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.5" diff --git a/media/tests/EffectsTest/res/layout/virtualizertest.xml b/media/tests/EffectsTest/res/layout/virtualizertest.xml index c9203de..1fafeab 100755 --- a/media/tests/EffectsTest/res/layout/virtualizertest.xml +++ b/media/tests/EffectsTest/res/layout/virtualizertest.xml @@ -105,6 +105,8 @@ style="@android:style/TextAppearance.Medium" /> <EditText android:id="@+id/sessionEdit" + android:singleLine="true" + android:numeric="integer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.5" diff --git a/media/tests/EffectsTest/res/layout/visualizertest.xml b/media/tests/EffectsTest/res/layout/visualizertest.xml index 8611e8c..50ac7bb 100755 --- a/media/tests/EffectsTest/res/layout/visualizertest.xml +++ b/media/tests/EffectsTest/res/layout/visualizertest.xml @@ -105,6 +105,8 @@ style="@android:style/TextAppearance.Medium" /> <EditText android:id="@+id/sessionEdit" + android:singleLine="true" + android:numeric="integer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.5" diff --git a/media/tests/EffectsTest/src/com/android/effectstest/EffectsTest.java b/media/tests/EffectsTest/src/com/android/effectstest/EffectsTest.java index 6612766..7020246 100755 --- a/media/tests/EffectsTest/src/com/android/effectstest/EffectsTest.java +++ b/media/tests/EffectsTest/src/com/android/effectstest/EffectsTest.java @@ -32,6 +32,7 @@ import android.widget.ListView; import android.widget.BaseAdapter; import android.widget.LinearLayout; import android.media.audiofx.AudioEffect; + import java.util.UUID; public class EffectsTest extends Activity { @@ -154,13 +155,35 @@ public class EffectsTest extends Activity { this.setOrientation(VERTICAL); } + public String effectUuidToString(UUID effectType) { + if (effectType.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) { + return "Virtualizer"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_ENV_REVERB)){ + return "Reverb"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_PRESET_REVERB)){ + return "Preset Reverb"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)){ + return "Equalizer"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)){ + return "Bass Boost"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_AGC)){ + return "Automatic Gain Control"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_AEC)){ + return "Acoustic Echo Canceler"; + } else if (effectType.equals(AudioEffect.EFFECT_TYPE_NS)){ + return "Noise Suppressor"; + } + + return effectType.toString(); + } + public void set(int position) { TextView tv = new TextView(mContext); tv.setText("Effect "+ position); addView(tv, new LinearLayout.LayoutParams( LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); tv = new TextView(mContext); - tv.setText(" type: "+ mDescriptors[position].type.toString()); + tv.setText(" type: "+ effectUuidToString(mDescriptors[position].type)); addView(tv, new LinearLayout.LayoutParams( LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); tv = new TextView(mContext); |