summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiabin <jiabin@google.com>2019-05-23 11:18:40 -0700
committerjiabin <jiabin@google.com>2019-05-23 11:18:40 -0700
commit1761a34a93f49a9619a6402aecc2f591f6981d04 (patch)
treea30ca9228eecaeb7d346eac41ad6f97780528c57
parent161a6f2ae4bdfde1a469bdf5e66db4bbff770671 (diff)
downloadMusicFX-1761a34a93f49a9619a6402aecc2f591f6981d04.tar.gz
Add support for localized equalizer preset effect names.
Use localized equalizer preset names if it is found in the predefined list. Bug: 129987652 Test: Manually Change-Id: Ia327ddf985a9e31a2c4e1305ae83e0a78e175b42
-rw-r--r--res/values/strings.xml11
-rw-r--r--src/com/android/musicfx/ActivityMusic.java23
2 files changed, 34 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 143efa5..77f32b3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,6 +24,17 @@
<string name="bass_boost_strength">Bass boost</string>
<string name="virtualizer_strength">Surround sound</string>
<string name="setup">Setup</string>
+ <!-- Equalizer preset names -->
+ <string name="normal">Normal</string>
+ <string name="classical">Classical</string>
+ <string name="dance">Dance</string>
+ <string name="flat">Flat</string>
+ <string name="folk">Folk</string>
+ <string name="heavy_metal">Heavy Metal</string>
+ <string name="hip_hop">Hip Hop</string>
+ <string name="jazz">Jazz</string>
+ <string name="pop">Pop</string>
+ <string name="rock">Rock</string>
<string name="ci_extreme">FX booster</string>
<string name="user">User</string>
diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index 03f3397..3fb58d4 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -60,7 +60,9 @@ import android.widget.TextView;
import android.widget.Toast;
import java.util.Formatter;
+import java.util.HashMap;
import java.util.Locale;
+import java.util.Map;
import java.util.UUID;
/**
@@ -166,6 +168,23 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
"LargeRoom", "MediumHall", "LargeHall", "Plate" };
/**
+ * Default localized equalizer preset names. Keep the same as EffectBundle::gEqualizerPresets.
+ */
+ private static final Map<String, Integer> LOCALIZED_EQUALIZER_PRESET_NAMES
+ = new HashMap<String, Integer>() {{
+ put("Normal", R.string.normal);
+ put("Classical", R.string.classical);
+ put("Dance", R.string.dance);
+ put("Flat", R.string.flat);
+ put("Folk", R.string.folk);
+ put("Heavy Metal", R.string.heavy_metal);
+ put("Hip Hop", R.string.hip_hop);
+ put("Jazz", R.string.jazz);
+ put("Pop", R.string.pop);
+ put("Rock", R.string.rock);
+ }};
+
+ /**
* Context field
*/
private Context mContext;
@@ -287,6 +306,10 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
for (short i = 0; i < numPresets; i++) {
mEQPresetNames[i] = ControlPanelEffect.getParameterString(mContext,
mCallingPackageName, mAudioSession, ControlPanelEffect.Key.eq_preset_name, i);
+ Integer localizedNameId = LOCALIZED_EQUALIZER_PRESET_NAMES.get(mEQPresetNames[i]);
+ if (localizedNameId != null) {
+ mEQPresetNames[i] = getString(localizedNameId);
+ }
}
mEQPresetNames[numPresets] = getString(R.string.ci_extreme);
mEQPresetNames[numPresets + 1] = getString(R.string.user);