Big refactor

 * Replace custom widgets with stock ones
 * Remove dead code
 * Rename
 * Etc
 * Lots of stuff to do still

76 files changed, 114 insertions, 418 deletions

diff --git a/Android.mk b/Android.mk
index d471e83..f5b67c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVA_LIBRARIES := framework
 
-LOCAL_PACKAGE_NAME := MusicFX
+LOCAL_PACKAGE_NAME := AudioFX
 
 LOCAL_PRIVILEGED_MODULE := true
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86dd544..20f8848 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.musicfx"
+    package="org.cyanogenmod.audiofx"
     android:installLocation="auto"
     android:versionName="1.4" android:versionCode="10400">
     
diff --git a/res/layout-sw330dp/music_main.xml b/res/layout-sw330dp/music_main.xml
index 76d2bf0..03b662b 100644
--- a/res/layout-sw330dp/music_main.xml
+++ b/res/layout-sw330dp/music_main.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/com.android.musicfx"
+    xmlns:custom="http://schemas.android.com/apk/res/org.cyanogenmod.audiofx"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,7 +35,7 @@
         android:layout_weight="1"
         android:visibility="gone" />
 
-    <com.android.musicfx.widget.InterceptableLinearLayout
+    <org.cyanogenmod.audiofx.widget.InterceptableLinearLayout
         android:id="@+id/contentSoundEffects"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
             android:layout_height="0dip"
             android:layout_weight="26" />
 
-        <com.android.musicfx.widget.Gallery
+        <org.cyanogenmod.audiofx.widget.Gallery
             android:id="@+id/eqPresets"
             android:layout_width="match_parent"
             android:layout_height="0dip"
@@ -65,14 +65,14 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <com.android.musicfx.widget.Knob
+            <org.cyanogenmod.audiofx.widget.Knob
                 android:id="@+id/bBStrengthKnob"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 custom:label="@string/bass_boost_strength"
                 custom:foreground="@drawable/knob_large" />
 
-            <com.android.musicfx.widget.Knob
+            <org.cyanogenmod.audiofx.widget.Knob
                 android:id="@+id/vIStrengthKnob"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -89,5 +89,5 @@
             android:drawSelectorOnTop="true"
         />
 
-    </com.android.musicfx.widget.InterceptableLinearLayout>
+    </org.cyanogenmod.audiofx.widget.InterceptableLinearLayout>
 </LinearLayout>
diff --git a/res/layout/equalizer.xml b/res/layout/equalizer.xml
index 0ec8fe5..efc371e 100644
--- a/res/layout/equalizer.xml
+++ b/res/layout/equalizer.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="center">
 
-    <com.android.musicfx.widget.EqualizerSurface
+    <org.cyanogenmod.audiofx.widget.EqualizerSurface
         android:id="@+id/frequencyResponse"
         android:layout_height="match_parent"
         android:layout_width="match_parent" />
diff --git a/res/layout/music_main.xml b/res/layout/music_main.xml
index b2bb4c5..b912f03 100644
--- a/res/layout/music_main.xml
+++ b/res/layout/music_main.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/com.android.musicfx"
+    xmlns:custom="http://schemas.android.com/apk/res/org.cyanogenmod.audiofx"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,7 +35,7 @@
         android:layout_weight="1"
         android:visibility="gone" />
 
-    <com.android.musicfx.widget.InterceptableLinearLayout
+    <org.cyanogenmod.audiofx.widget.InterceptableLinearLayout
         android:id="@+id/contentSoundEffects"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
             android:layout_height="0dip"
             android:layout_weight="26" />
 
-        <com.android.musicfx.widget.Gallery
+        <org.cyanogenmod.audiofx.widget.Gallery
             android:id="@+id/eqPresets"
             android:layout_width="match_parent"
             android:layout_height="0dip"
@@ -65,14 +65,14 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <com.android.musicfx.widget.Knob
+            <org.cyanogenmod.audiofx.widget.Knob
                 android:id="@+id/bBStrengthKnob"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 custom:label="@string/bass_boost_strength"
                 custom:foreground="@drawable/knob" />
 
-            <com.android.musicfx.widget.Knob
+            <org.cyanogenmod.audiofx.widget.Knob
                 android:id="@+id/vIStrengthKnob"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -89,5 +89,5 @@
             android:drawSelectorOnTop="true"
         />
 
-    </com.android.musicfx.widget.InterceptableLinearLayout>
+    </org.cyanogenmod.audiofx.widget.InterceptableLinearLayout>
 </LinearLayout>
diff --git a/res/layout/visualizer.xml b/res/layout/visualizer.xml
index 4b50b8d..1569f3e 100644
--- a/res/layout/visualizer.xml
+++ b/res/layout/visualizer.xml
@@ -35,7 +35,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     android:layout_height="wrap_content"
     android:gravity="bottom|center_horizontal">
 
-    <com.android.musicfx.seekbar.SeekBar
+    <org.cyanogenmod.audiofx.seekbar.SeekBar
         android:id="@+id/EQBandSeekBar"
         style="@style/Widget.Holo.SeekBar.Vertical"
         android:layout_marginStart="@dimen/eq_slider_margin"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9d1fd7d..8dd1abe 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effekte nie beskikbaar nie."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Oudio-effekte"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Effenaar"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 34f777e..ccbda06 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"ኢፌክት አልተገኘም"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"የድም ፅ ተፅዕኖች"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"ማመጣጠኛ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9e2aa66..23f1778 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"التأثيرات غير متاحة."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"تأثيرات الصوت"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"المعادل"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 6891e82..1bd430f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Эфекты недаступныя."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Гукавыя эфекты"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Эквалайзер"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bb58711..1810876 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Ефектите не са налични."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Аудиоефекти"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Еквалайзър"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 043dd5b..1c9bada 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efectes no disponibles."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efectes d\'àudio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalitzador"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e275a0..321d05c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efekty nejsou k dispozici."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Zvukové efekty"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalizér"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ed144d9..b8a269a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effekterne er ikke tilgængelige."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Lydeffekter"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b453881..47f13f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effekte nicht verfügbar"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Audio-Effekte"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 96c284b..93b70bc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Τα εφέ δεν είναι διαθέσιμα."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Εφέ ήχου"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ισοσταθμιστής"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2cec2c9..8287e60 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effects not available."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Audio effects"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equaliser"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2cec2c9..8287e60 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effects not available."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Audio effects"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equaliser"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2cb9482..9e9e4b3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efectos no disponibles"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efectos de audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ecualizador"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ceb7e33..8f328ba 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efectos no disponibles"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efectos de audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ecualizador"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 60c7fb7..1206e4c 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efektid pole saadaval"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Heliefektid"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalaiser"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 60c7fb7..1206e4c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efektid pole saadaval"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Heliefektid"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalaiser"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f0a41fc..6ac8a51 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"جلوه‌ها در دسترس نیستند."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"جلوه‌های صوتی"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"اکولایزر"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 193357e..0660f21 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Tehosteet eivät ole käytettävissä."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Äänitehosteet"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Taajuuskorjain"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9e28a50..2aef940 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effets indisponibles."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Effets audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Égaliseur"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d88c993..975d514 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effets indisponibles."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Effets audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Égaliseur"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b730358..89e1469 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"प्रभाव उपलब्ध नहीं."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"ऑडियो प्रभाव"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"इक्वलाइज़र"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index cd86a6d..c3426b3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efekti nisu dostupni."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Zvučni efekti"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalizator"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6c2c216..23ed0b2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Nem állnak rendelkezésre effektek."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Hangeffektusok"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Hangszín"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index af87ab1..d907665 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efek tidak tersedia."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efek audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekualizer"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 07aa5b0..28cc99a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effetti non disponibili."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Effetti audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizzatore"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 29f6ed2..e886429 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"האפקטים אינם זמינים."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"אפקטי אודיו"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4976070..70dccc2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"効果は利用できません。"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"オーディオ効果"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"イコライザー"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9683e08..a098f05 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"효과를 사용할 수 없습니다."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"오디오 효과"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"이퀄라이저"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2e87862..17295ff 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efektai nepasiekiami."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Garso efektai"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Vienodintuvas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 733d438..f54e109 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efekti nav pieejami."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Audio efekti"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalaizers"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 66bd3c1..275729f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Kesan tidak tersedia."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Kesan audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Penyama"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 66bd3c1..275729f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Kesan tidak tersedia."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Kesan audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Penyama"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 923af46..82eb4e8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effekter er ikke tilgjengelige."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Lydeffekter"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9de8cd5..3225491 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effecten niet beschikbaar."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Audio-effecten"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 506a781..9ca9ec9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efekty niedostępne"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efekty dźwiękowe"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3f3a507..51c4313 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efeitos não disponíveis."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efeitos de áudio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizador"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4cda20f..f3672b4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efeitos não disponíveis."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efeitos de áudio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizador"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0e1c591..b49ccaf 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efectele nu sunt disponibile."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Efecte audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Egalizator"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 05297aa..f705c88 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Эффекты недоступны."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Аудиоэффекты"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Эквалайзер"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 62c2f31..05331e9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efekty nie sú k dispozícii."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Zvukové efekty"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalizér"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c836f47..b0f6a1f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Učinki niso na voljo."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Zvočni učinki"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Izenačevalnik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 42ce27d..2491b6c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Ефекти нису доступни."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Аудио ефекти"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Еквилајзер"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e7b371f..c543d59 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Effekter är inte tillgängliga."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Ljudeffekter"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b8cec19..4f043b3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"ไม่มีเอฟเฟ็กต์"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"เอฟเฟ็กต์เสียง"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"อีควอไลเซอร์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b533ae5..69b6335 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Hindi available ang mga effect."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Mga effect ng audio"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Equalizer"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1a54635..1bc6305 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Efektler kullanılamıyor."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Ses efektleri"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Ekolayzer"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bfdee89..1fa9b41 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Ефекти не доступні"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Аудіоефекти"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Еквалайзер"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3f38126..d06e028 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Không có hiệu ứng."</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Hiệu ứng âm thanh"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Bộ hiệu chỉnh"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fcf17bd..09b85ce 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"无法使用音效"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"音效"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"骁龙音效"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 478f500..9d33a67 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"無法使用音效"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"音效"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"驍龍音效"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 478f500..9d33a67 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"無法使用音效"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"音效"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"驍龍音效"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9bf5df5..2353bc3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="app_name" msgid="5717136097222561957">"AudioFX"</string>
     <string name="no_effects" msgid="5067916002004255814">"Imiphumela ayitholakali"</string>
     <string name="main_toggle_effects_title" msgid="612896145300512593">"Imphumelo Yomsindo"</string>
     <string name="eq_dialog_title" msgid="2020244436368289652">"Isilinganisi somsindo"</string>
diff --git a/res/values/color.xml b/res/values/color.xml
index a845c98..68a96e8 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -29,8 +29,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
 <resources>
-    <color name="highlight">#f41e26</color>
-    <color name="lowlight">#650101</color>
+    <color name="highlight">@android:color/holo_blue_light</color>
+    <color name="lowlight">@android:color/holo_blue_dark</color>
     <color name="grey">#e7e7e7</color>
     <color name="disabled">#525252</color>
     <color name="disabled_gallery">#888888</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fe8d08..aa5f4ea 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,12 +15,12 @@
 -->
 
 <resources>
-    <string name="app_name">MusicFX</string>
+    <string name="app_name">AudioFX</string>
 
     <!-- ControlPanelMusic strings -->
     <string name="no_effects">Effects not available.</string>
     <string name="main_toggle_effects_title">Audio effects</string>
-    <string name="eq_dialog_title">CyanogenAudio</string>
+    <string name="eq_dialog_title">AudioFX</string>
     <string name="headset_plug">Plug in headphones for these effects.</string>
     <string name="bass_boost_strength">Bass boost</string>
     <string name="virtualizer_strength">Surround sound</string>
diff --git a/src/com/android/musicfx/widget/Visualizer.java b/src/com/android/musicfx/widget/Visualizer.java
deleted file mode 100644
index 161ebe7..0000000
--- a/src/com/android/musicfx/widget/Visualizer.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.android.musicfx.widget;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.musicfx.R;
-import com.android.musicfx.seekbar.SeekBar;
-
-public class Visualizer extends LinearLayout {
-    public interface OnSeekBarChangeListener {
-        public void onProgressChanged(Visualizer visualizer, int progress, boolean fromUser);
-        public void onStartTrackingTouch(Visualizer visualizer);
-        public void onStopTrackingTouch(Visualizer visualizer);
-    }
-
-    private final int MAX_TILES = 17;
-    private final float SPACE_RATIO = 2.618f;
-    private final float HORIZONTAL_PADDING = 0.138f;
-    private final int VERTICAL_PADDING = 20;
-
-    private final TextView mTV;
-    private final SeekBar mSB;
-    private OnSeekBarChangeListener mOnSeekBarChangeListener;
-
-    private boolean mEnabled;
-    private boolean mShowSeekBar = false;
-    private int mMax;
-    private int mProgress;
-
-    private int mWidth;
-    private float mHeight;
-    private float mBaseHeight;
-    private final float mTVHeight;
-
-    private int mHighlightColor;
-    private int mLowlightColor;
-    private int mDisabledColor;
-    private final Paint mPaint;
-
-    public Visualizer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        LayoutInflater li = (LayoutInflater)
-                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        li.inflate(R.layout.visualizer, this, true);
-
-        Resources res = getResources();
-        mHighlightColor = res.getColor(R.color.highlight);
-        mLowlightColor = res.getColor(R.color.lowlight);
-        mDisabledColor = res.getColor(R.color.disabled);
-        mTVHeight = res.getDimension(R.dimen.eq_text_height);
-
-        mTV = (TextView) findViewById(R.id.EQBandTextView);
-        mSB = (SeekBar) findViewById(R.id.EQBandSeekBar);
-        final Visualizer v = this;
-        mSB.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(final SeekBar seekbar, final int progress,
-                final boolean fromUser) {
-                if (mOnSeekBarChangeListener != null) {
-                    mOnSeekBarChangeListener.onProgressChanged(v, progress, fromUser);
-                }
-            }
-
-            @Override
-            public void onStartTrackingTouch(final SeekBar seekbar) {
-                if (mOnSeekBarChangeListener != null) {
-                    mOnSeekBarChangeListener.onStartTrackingTouch(v);
-                }
-            }
-
-            @Override
-            public void onStopTrackingTouch(final SeekBar seekbar) {
-                if (mOnSeekBarChangeListener != null) {
-                    mOnSeekBarChangeListener.onStopTrackingTouch(v);
-                }
-            }
-        });
-
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        setWillNotDraw(false);
-    }
-
-    public Visualizer(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public Visualizer(Context context) {
-        this(context, null);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldW, int oldH) {
-        mWidth = w;
-        mHeight = h;
-        // Calculate the height of each tile
-        mBaseHeight = (mHeight - VERTICAL_PADDING * 2 - mTVHeight)
-                / (MAX_TILES * SPACE_RATIO + MAX_TILES - 1);
-        final LayoutParams params = new LayoutParams(
-                LayoutParams.WRAP_CONTENT, (int) (mHeight - mTVHeight));
-        mSB.setLayoutParams(params);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mShowSeekBar) {
-            return;
-        }
-        boolean topDrawn = false;
-        final RectF rf = new RectF();
-
-        // Count of visible tiles
-        int tiles = (int) ((float) mProgress * MAX_TILES / mMax + 0.5);
-        for (int i = MAX_TILES - tiles; i < MAX_TILES; ++i) {
-            if (mEnabled) {
-                if (!topDrawn) {
-                    topDrawn = true;
-                    mPaint.setColor(mHighlightColor);
-                } else {
-                    mPaint.setColor(mLowlightColor);
-                }
-            } else {
-                mPaint.setColor(mDisabledColor);
-            }
-
-            // Draw a tile
-            rf.set(mWidth * HORIZONTAL_PADDING,
-                    i * (SPACE_RATIO + 1) * mBaseHeight + VERTICAL_PADDING,
-                    mWidth * (1 - HORIZONTAL_PADDING),
-                    ((i + 1) * SPACE_RATIO + i) * mBaseHeight + VERTICAL_PADDING);
-            canvas.drawRect(rf, mPaint);
-        }
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        mEnabled = enabled;
-        if (!enabled) {
-            setShowSeekBar(false);
-        }
-        invalidate();
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return mEnabled;
-    }
-
-    public void setText(final String text) {
-        mTV.setText(text);
-    }
-
-    public void setMax(int max) {
-        mMax = max;
-        mSB.setMax(max);
-    }
-
-    public void setOnSeekBarChangeListener(OnSeekBarChangeListener l) {
-        mOnSeekBarChangeListener = l;
-    }
-
-    public void setProgress(int progress) {
-        mProgress = progress;
-        mSB.setProgress(progress);
-        invalidate();
-    }
-
-    public void setShowSeekBar(boolean show) {
-        if (mEnabled || !show) {
-            mShowSeekBar = show;
-            mSB.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
-            invalidate();
-        }
-    }
-}
diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/org/cyanogenmod/audiofx/ActivityMusic.java
index 7189181..d2985cc 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/org/cyanogenmod/audiofx/ActivityMusic.java
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.musicfx;
-
-import com.android.audiofx.OpenSLESConstants;
-import com.android.musicfx.seekbar.SeekBar;
-import com.android.musicfx.widget.EqualizerSurface;
-import com.android.musicfx.widget.Gallery;
-import com.android.musicfx.widget.InterceptableLinearLayout;
-import com.android.musicfx.widget.Knob;
-import com.android.musicfx.widget.Knob.OnKnobChangeListener;
-import com.android.musicfx.widget.Visualizer;
-import com.android.musicfx.widget.Visualizer.OnSeekBarChangeListener;
+package org.cyanogenmod.audiofx;
+
+import org.cyanogenmod.audiofx.widget.EqualizerSurface;
+import org.cyanogenmod.audiofx.widget.Gallery;
+import org.cyanogenmod.audiofx.widget.InterceptableLinearLayout;
+import org.cyanogenmod.audiofx.widget.Knob;
+import org.cyanogenmod.audiofx.widget.Knob.OnKnobChangeListener;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -61,6 +57,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
+import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
@@ -74,7 +71,7 @@ import java.util.UUID;
  *
  */
 public class ActivityMusic extends Activity {
-    private final static String TAG = "MusicFXActivityMusic";
+    private final static String TAG = "AudioFXActivityMusic";
 
     /**
      * Max number of EQ bands supported
@@ -111,7 +108,7 @@ public class ActivityMusic extends Activity {
     private int mPRPresetPrevious;
 
     private boolean mIsHeadsetOn = false;
-    private ToggleButton mToggleSwitch;
+    private Switch mToggleSwitch;
 
     private StringBuilder mFormatBuilder = new StringBuilder();
     private Formatter mFormatter = new Formatter(mFormatBuilder, Locale.getDefault());
@@ -176,8 +173,7 @@ public class ActivityMusic extends Activity {
     };
 
     /*
-     * Declares and initializes all objects and widgets in the layouts and the CheckBox and SeekBar
-     * onchange methods on creation.
+     * Declares and initializes all objects and widgets in the layouts
      *
      * (non-Javadoc)
      *
@@ -266,16 +262,14 @@ public class ActivityMusic extends Activity {
             // Set the listener for the main enhancements toggle button.
             // Depending on the state enable the supported effects if they were
             // checked in the setup tab.
-            mToggleSwitch = new ToggleButton(this);
-            mToggleSwitch.setBackgroundResource(R.drawable.switch_thumb_off);
-            mToggleSwitch.setTextOn("");
-            mToggleSwitch.setTextOff("");
+            mToggleSwitch = new Switch(this);
+            final int padding = getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mToggleSwitch.setPaddingRelative(0, 0, padding, 0);
             mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(final CompoundButton buttonView,
                         final boolean isChecked) {
-                    buttonView.setBackgroundResource(isChecked ?
-                        R.drawable.switch_thumb_activated : R.drawable.switch_thumb_off);
                     // set parameter and state
                     ControlPanelEffect.setParameterBoolean(mContext, mCallingPackageName,
                             mAudioSession, ControlPanelEffect.Key.global_enabled, isChecked);
@@ -289,7 +283,6 @@ public class ActivityMusic extends Activity {
             });
 
             // Initialize the Virtualizer elements.
-            // Set the SeekBar listener.
             if (mVirtualizerSupported) {
                 final Knob knob = (Knob) findViewById(R.id.vIStrengthKnob);
                 knob.setMax(OpenSLESConstants.VIRTUALIZER_MAX_STRENGTH -
@@ -319,7 +312,6 @@ public class ActivityMusic extends Activity {
             }
 
             // Initialize the Bass Boost elements.
-            // Set the SeekBar listener.
             if (mBassBoostSupported) {
                 final Knob knob = (Knob) findViewById(R.id.bBStrengthKnob);
                 knob.setMax(OpenSLESConstants.BASSBOOST_MAX_STRENGTH
@@ -376,15 +368,12 @@ public class ActivityMusic extends Activity {
 
         ActionBar ab = getActionBar();
         final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
-                getResources().getDimensionPixelSize(R.dimen.action_bar_button_width),
-                getResources().getDimensionPixelSize(R.dimen.action_bar_button_height),
-                Gravity.CENTER_VERTICAL | Gravity.RIGHT);
-        final int margin = getResources().getDimensionPixelSize(R.dimen.action_bar_switch_padding);
-        params.setMargins(0, 0, margin, 0);
-        ab.setBackgroundDrawable(getResources().getDrawable(R.drawable.ab_transparent_dark_holo));
-        ab.setCustomView(mToggleSwitch, params);
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.END);
         ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM
                 | ActionBar.DISPLAY_HOME_AS_UP);
+        ab.setCustomView(mToggleSwitch, params);
     }
 
     private final String localizePresetName(final String name) {
@@ -646,85 +635,6 @@ public class ActivityMusic extends Activity {
             }
         };
         eq.registerBandUpdatedListener(listener);
-
-        /*
-        final OnSeekBarChangeListener listener = new OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(final Visualizer v, final int progress,
-                    final boolean fromUser) {
-                for (short band = 0; band < mNumberEqualizerBands; ++band) {
-                    if (mEqualizerVisualizer[band] == v) {
-                        final short level = (short) (progress + mEqualizerMinBandLevel);
-                        if (fromUser) {
-                            equalizerBandUpdate(band, level);
-                        }
-                        break;
-                    }
-                }
-            }
-
-            @Override
-            public void onStartTrackingTouch(final Visualizer v) {
-            }
-
-            @Override
-            public void onStopTrackingTouch(final Visualizer v) {
-                equalizerUpdateDisplay();
-            }
-        };
-        final OnTouchListener tl = new OnTouchListener() {
-            @Override
-            public boolean onTouch(final View v, final MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN:
-                        if (mEQPreset != mEQPresetUserPos) {
-                            final Toast toast = Toast.makeText(mContext,
-                                    getString(R.string.eq_custom), Toast.LENGTH_SHORT);
-                            toast.setGravity(Gravity.TOP | Gravity.CENTER, 0,
-                                    toast.getYOffset() * 2);
-                            toast.show();
-                            return true;
-                        }
-                        return false;
-                    default:
-                        return false;
-                }
-            }
-        };
-
-        DisplayMetrics metrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(metrics);
-        final int pixels = (int) (metrics.widthPixels / (mNumberEqualizerBands + 1.5f));
-        final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                pixels, ViewGroup.LayoutParams.MATCH_PARENT);
-        for (int band = 0; band < mNumberEqualizerBands; band++) {
-            // Unit conversion from mHz to Hz and use k prefix if necessary to display
-            final int centerFreq = centerFreqs[band] / 1000;
-            float centerFreqHz = centerFreq;
-            String unitPrefix = "";
-            if (centerFreqHz >= 1000) {
-                centerFreqHz = centerFreqHz / 1000;
-                unitPrefix = "k";
-            }
-
-            final Visualizer v = new Visualizer(mContext);
-            v.setText(format("%.0f", centerFreqHz) + unitPrefix);
-            v.setMax(mEqualizerMaxBandLevel - mEqualizerMinBandLevel);
-            v.setOnSeekBarChangeListener(listener);
-            v.setOnTouchListener(tl);
-            eqcontainer.addView(v, lp);
-            mEqualizerVisualizer[band] = v;
-        }
-
-        // TODO: get the actual values from somewhere
-        TextView tv = (TextView) findViewById(R.id.maxLevelText);
-        tv.setText("+15 dB");
-        tv = (TextView) findViewById(R.id.centerLevelText);
-        tv.setText("0 dB");
-        tv = (TextView) findViewById(R.id.minLevelText);
-        tv.setText("-15 dB");
-        equalizerUpdateDisplay();
-        */
     }
 
     private String format(String format, Object... args) {
diff --git a/src/com/android/musicfx/Compatibility.java b/src/org/cyanogenmod/audiofx/Compatibility.java
index 107e132..c0e72c2 100644
--- a/src/com/android/musicfx/Compatibility.java
+++ b/src/org/cyanogenmod/audiofx/Compatibility.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx;
+package org.cyanogenmod.audiofx;
 
 import android.app.Activity;
 import android.app.IntentService;
@@ -45,8 +45,8 @@ import java.util.List;
  */
 public class Compatibility {
 
-    private final static String TAG = "MusicFXCompat";
-    // run "setprop log.tag.MusicFXCompat DEBUG" to turn on logging
+    private final static String TAG = "AudioFXCompat";
+    // run "setprop log.tag.AudioFXCompat DEBUG" to turn on logging
     private final static boolean LOG = Log.isLoggable(TAG, Log.DEBUG);
 
 
diff --git a/src/com/android/musicfx/ControlPanelEffect.java b/src/org/cyanogenmod/audiofx/ControlPanelEffect.java
index b813264..f028105 100644
--- a/src/com/android/musicfx/ControlPanelEffect.java
+++ b/src/org/cyanogenmod/audiofx/ControlPanelEffect.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx;
+package org.cyanogenmod.audiofx;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ControlPanelEffect {
 
-    private final static String TAG = "MusicFXControlPanelEffect";
+    private final static String TAG = "AudioFXControlPanelEffect";
 
     /**
      * Audio session priority
diff --git a/src/com/android/musicfx/ControlPanelPicker.java b/src/org/cyanogenmod/audiofx/ControlPanelPicker.java
index bee9924..1c6eaaf 100644
--- a/src/com/android/musicfx/ControlPanelPicker.java
+++ b/src/org/cyanogenmod/audiofx/ControlPanelPicker.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.musicfx;
+package org.cyanogenmod.audiofx;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.internal.app.AlertController.AlertParams.OnPrepareListViewListener;
-import com.android.musicfx.Compatibility.Service;
+import org.cyanogenmod.audiofx.Compatibility.Service;
 
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
diff --git a/src/com/android/musicfx/ControlPanelReceiver.java b/src/org/cyanogenmod/audiofx/ControlPanelReceiver.java
index 563e3ef..4c693ec 100644
--- a/src/com/android/musicfx/ControlPanelReceiver.java
+++ b/src/org/cyanogenmod/audiofx/ControlPanelReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx;
+package org.cyanogenmod.audiofx;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -27,7 +27,7 @@ import java.util.HashMap;
 
 public class ControlPanelReceiver extends BroadcastReceiver {
 
-    private final static String TAG = "MusicFXControlPanelReceiver";
+    private final static String TAG = "AudioFXControlPanelReceiver";
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
diff --git a/src/com/android/audiofx/OpenSLESConstants.java b/src/org/cyanogenmod/audiofx/OpenSLESConstants.java
index 1109ce5..2131b55 100644
--- a/src/com/android/audiofx/OpenSLESConstants.java
+++ b/src/org/cyanogenmod/audiofx/OpenSLESConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.audiofx;
+package org.cyanogenmod.audiofx;
 
 /**
  * OpenSL ES constants class
diff --git a/src/com/android/musicfx/seekbar/AbsSeekBar.java b/src/org/cyanogenmod/audiofx/seekbar/AbsSeekBar.java
index 1d9df55..62a10a7 100644
--- a/src/com/android/musicfx/seekbar/AbsSeekBar.java
+++ b/src/org/cyanogenmod/audiofx/seekbar/AbsSeekBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx.seekbar;
+package org.cyanogenmod.audiofx.seekbar;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/musicfx/seekbar/ProgressBar.java b/src/org/cyanogenmod/audiofx/seekbar/ProgressBar.java
index 9c4264d..92828ae 100644
--- a/src/com/android/musicfx/seekbar/ProgressBar.java
+++ b/src/org/cyanogenmod/audiofx/seekbar/ProgressBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx.seekbar;
+package org.cyanogenmod.audiofx.seekbar;
 
 import com.android.internal.R;
 
diff --git a/src/com/android/musicfx/seekbar/SeekBar.java b/src/org/cyanogenmod/audiofx/seekbar/SeekBar.java
index 2be99ce..a137a40 100644
--- a/src/com/android/musicfx/seekbar/SeekBar.java
+++ b/src/org/cyanogenmod/audiofx/seekbar/SeekBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.musicfx.seekbar;
+package org.cyanogenmod.audiofx.seekbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/musicfx/widget/Biquad.java b/src/org/cyanogenmod/audiofx/widget/Biquad.java
index 7241f8d..f90153d 100644
--- a/src/com/android/musicfx/widget/Biquad.java
+++ b/src/org/cyanogenmod/audiofx/widget/Biquad.java
@@ -1,4 +1,4 @@
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 /**
  * Evaluate transfer functions of biquad filters in direct form 1.
diff --git a/src/com/android/musicfx/widget/Complex.java b/src/org/cyanogenmod/audiofx/widget/Complex.java
index 5de96b5..b4691a3 100644
--- a/src/com/android/musicfx/widget/Complex.java
+++ b/src/org/cyanogenmod/audiofx/widget/Complex.java
@@ -1,4 +1,4 @@
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 /**
  * Java support for complex numbers.
diff --git a/src/com/android/musicfx/widget/EqualizerSurface.java b/src/org/cyanogenmod/audiofx/widget/EqualizerSurface.java
index 4ab25c7..c8b39e3 100644
--- a/src/com/android/musicfx/widget/EqualizerSurface.java
+++ b/src/org/cyanogenmod/audiofx/widget/EqualizerSurface.java
@@ -17,7 +17,7 @@
  * - Modified extensively by cyanogen for multi-band support
  */
 
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -34,8 +34,8 @@ import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.View;
 
-import com.android.musicfx.R;
-import com.android.musicfx.widget.EqualizerSurface.BandUpdatedListener;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.widget.EqualizerSurface.BandUpdatedListener;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/musicfx/widget/Gallery.java b/src/org/cyanogenmod/audiofx/widget/Gallery.java
index da7530d..8bb5f2a 100644
--- a/src/com/android/musicfx/widget/Gallery.java
+++ b/src/org/cyanogenmod/audiofx/widget/Gallery.java
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -36,7 +36,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.TextView;
 
-import com.android.musicfx.R;
+import org.cyanogenmod.audiofx.R;
 
 public class Gallery extends android.widget.Gallery {
     public interface OnItemSelectedListener {
diff --git a/src/com/android/musicfx/widget/InterceptableLinearLayout.java b/src/org/cyanogenmod/audiofx/widget/InterceptableLinearLayout.java
index ba53126..c8d838a 100644
--- a/src/com/android/musicfx/widget/InterceptableLinearLayout.java
+++ b/src/org/cyanogenmod/audiofx/widget/InterceptableLinearLayout.java
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/musicfx/widget/Knob.java b/src/org/cyanogenmod/audiofx/widget/Knob.java
index 0bd5867..874d965 100644
--- a/src/com/android/musicfx/widget/Knob.java
+++ b/src/org/cyanogenmod/audiofx/widget/Knob.java
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.android.musicfx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -46,7 +46,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import java.lang.Math;
 
-import com.android.musicfx.R;
+import org.cyanogenmod.audiofx.R;
 
 public class Knob extends FrameLayout {
     private static final int STROKE_WIDTH = 6;