commit 954665bfbf1a3190ce35ef10ed20b40da78b70d8
author Xin Li <delphij@google.com> Wed Oct 30 16:03:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 16:03:00 2019 -0700
tree a30ca9228eecaeb7d346eac41ad6f97780528c57
parent 2092bc00815a98b5aa5688e659e958f258c6e0cd
parent c7ce7324e34c37f10d68563eaf28057185ae4487

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: a7861dc74e
am: c7ce7324e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I9995e31f1eec5762409024f4441cb8009332c77a

res/values/strings.xml

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>
 

src/com/android/musicfx/ActivityMusic.java

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.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 @@
             "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 @@
         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);