AudioFX: add super charger script

Removed a bunch of old unused drawables to trim the fat.

Improve overdraw with:
- drawing the knobs manually instead of using images!
- set hardware layers on complex bar views as necessary
- set overlapping rendering calls as necessary
- use window background for coloring primary UI bg

Almost 60 fps now!

Change-Id: I32c037aab89ca8f504b9ed0ce8c95203939b474d
Signed-off-by: Roman Birg <roman@cyngn.com>

44 files changed, 7 insertions, 319 deletions

diff --git a/res/drawable-hdpi/ab_transparent_dark_holo.9.png b/res/drawable-hdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 8c6afff..0000000
--- a/res/drawable-hdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/preset_bar.9.png b/res/drawable-hdpi/preset_bar.9.png
deleted file mode 100644
index 71cbc96..0000000
--- a/res/drawable-hdpi/preset_bar.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/progress_vertical_bg_holo_dark.9.png b/res/drawable-hdpi/progress_vertical_bg_holo_dark.9.png
deleted file mode 100644
index 92e34bf..0000000
--- a/res/drawable-hdpi/progress_vertical_bg_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/progress_vertical_primary_holo_dark.9.png b/res/drawable-hdpi/progress_vertical_primary_holo_dark.9.png
deleted file mode 100644
index cbd537b..0000000
--- a/res/drawable-hdpi/progress_vertical_primary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/progress_vertical_secondary_holo_dark.9.png b/res/drawable-hdpi/progress_vertical_secondary_holo_dark.9.png
deleted file mode 100644
index 73a0e40..0000000
--- a/res/drawable-hdpi/progress_vertical_secondary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_control_disabled_holo.png b/res/drawable-hdpi/scrubber_control_disabled_holo.png
deleted file mode 100644
index c173f0e..0000000
--- a/res/drawable-hdpi/scrubber_control_disabled_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_control_focused_holo.png b/res/drawable-hdpi/scrubber_control_focused_holo.png
deleted file mode 100644
index d302df6..0000000
--- a/res/drawable-hdpi/scrubber_control_focused_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_control_normal_holo.png b/res/drawable-hdpi/scrubber_control_normal_holo.png
deleted file mode 100644
index 802d046..0000000
--- a/res/drawable-hdpi/scrubber_control_normal_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_control_pressed_holo.png b/res/drawable-hdpi/scrubber_control_pressed_holo.png
deleted file mode 100644
index 5e82872..0000000
--- a/res/drawable-hdpi/scrubber_control_pressed_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_vertical_primary_holo.9.png b/res/drawable-hdpi/scrubber_vertical_primary_holo.9.png
deleted file mode 100644
index 874dcc8..0000000
--- a/res/drawable-hdpi/scrubber_vertical_primary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_vertical_secondary_holo.9.png b/res/drawable-hdpi/scrubber_vertical_secondary_holo.9.png
deleted file mode 100644
index a783343..0000000
--- a/res/drawable-hdpi/scrubber_vertical_secondary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_vertical_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_vertical_track_holo_dark.9.png
deleted file mode 100644
index 9f12c60..0000000
--- a/res/drawable-hdpi/scrubber_vertical_track_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/scrubber_vertical_track_holo_light.9.png b/res/drawable-hdpi/scrubber_vertical_track_holo_light.9.png
deleted file mode 100644
index 325b86a..0000000
--- a/res/drawable-hdpi/scrubber_vertical_track_holo_light.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/switch_thumb_activated.9.png b/res/drawable-hdpi/switch_thumb_activated.9.png
deleted file mode 100644
index 072aa64..0000000
--- a/res/drawable-hdpi/switch_thumb_activated.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/switch_thumb_off.9.png b/res/drawable-hdpi/switch_thumb_off.9.png
deleted file mode 100644
index 45786a3..0000000
--- a/res/drawable-hdpi/switch_thumb_off.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/preset_bar.9.png b/res/drawable-mdpi/preset_bar.9.png
deleted file mode 100644
index 5cadbb4..0000000
--- a/res/drawable-mdpi/preset_bar.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/progress_vertical_bg_holo_dark.9.png b/res/drawable-mdpi/progress_vertical_bg_holo_dark.9.png
deleted file mode 100644
index 662e59b..0000000
--- a/res/drawable-mdpi/progress_vertical_bg_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/progress_vertical_primary_holo_dark.9.png b/res/drawable-mdpi/progress_vertical_primary_holo_dark.9.png
deleted file mode 100644
index e7e32cb..0000000
--- a/res/drawable-mdpi/progress_vertical_primary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/progress_vertical_secondary_holo_dark.9.png b/res/drawable-mdpi/progress_vertical_secondary_holo_dark.9.png
deleted file mode 100644
index 2fee3a8..0000000
--- a/res/drawable-mdpi/progress_vertical_secondary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/scrubber_vertical_primary_holo.9.png b/res/drawable-mdpi/scrubber_vertical_primary_holo.9.png
deleted file mode 100644
index ecea48d..0000000
--- a/res/drawable-mdpi/scrubber_vertical_primary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/scrubber_vertical_secondary_holo.9.png b/res/drawable-mdpi/scrubber_vertical_secondary_holo.9.png
deleted file mode 100644
index 35bf199..0000000
--- a/res/drawable-mdpi/scrubber_vertical_secondary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/scrubber_vertical_track_holo_dark.9.png b/res/drawable-mdpi/scrubber_vertical_track_holo_dark.9.png
deleted file mode 100644
index 8a7fbde..0000000
--- a/res/drawable-mdpi/scrubber_vertical_track_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/scrubber_vertical_track_holo_light.9.png b/res/drawable-mdpi/scrubber_vertical_track_holo_light.9.png
deleted file mode 100644
index 097d05e..0000000
--- a/res/drawable-mdpi/scrubber_vertical_track_holo_light.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/preset_bar.9.png b/res/drawable-xhdpi/preset_bar.9.png
deleted file mode 100644
index 11fbdc5..0000000
--- a/res/drawable-xhdpi/preset_bar.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/progress_vertical_primary_holo_dark.9.png b/res/drawable-xhdpi/progress_vertical_primary_holo_dark.9.png
deleted file mode 100644
index 27c8647..0000000
--- a/res/drawable-xhdpi/progress_vertical_primary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/progress_vertical_secondary_holo_dark.9.png b/res/drawable-xhdpi/progress_vertical_secondary_holo_dark.9.png
deleted file mode 100644
index 5c622d8..0000000
--- a/res/drawable-xhdpi/progress_vertical_secondary_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/scrubber_vertical_primary_holo.9.png b/res/drawable-xhdpi/scrubber_vertical_primary_holo.9.png
deleted file mode 100644
index 874dcc8..0000000
--- a/res/drawable-xhdpi/scrubber_vertical_primary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/scrubber_vertical_secondary_holo.9.png b/res/drawable-xhdpi/scrubber_vertical_secondary_holo.9.png
deleted file mode 100644
index a783343..0000000
--- a/res/drawable-xhdpi/scrubber_vertical_secondary_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/scrubber_vertical_track_holo_dark.9.png b/res/drawable-xhdpi/scrubber_vertical_track_holo_dark.9.png
deleted file mode 100644
index 5f0fc26..0000000
--- a/res/drawable-xhdpi/scrubber_vertical_track_holo_dark.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/scrubber_vertical_track_holo_light.9.png b/res/drawable-xhdpi/scrubber_vertical_track_holo_light.9.png
deleted file mode 100644
index fc89474..0000000
--- a/res/drawable-xhdpi/scrubber_vertical_track_holo_light.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/indicator.png b/res/drawable-xxhdpi/indicator.png
deleted file mode 100644
index 48a2f0b..0000000
--- a/res/drawable-xxhdpi/indicator.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/knob.png b/res/drawable-xxhdpi/knob.png
deleted file mode 100644
index 10a7ce9..0000000
--- a/res/drawable-xxhdpi/knob.png
+++ /dev/null
diff --git a/res/drawable/progress_vertical_holo_dark.xml b/res/drawable/progress_vertical_holo_dark.xml
deleted file mode 100644
index 9eb54b7..0000000
--- a/res/drawable/progress_vertical_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background"
-          android:drawable="@drawable/progress_vertical_bg_holo_dark" />
-
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-               android:drawable="@drawable/progress_vertical_secondary_holo_dark" />
-    </item>
-
-    <item android:id="@android:id/progress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-               android:drawable="@drawable/progress_vertical_primary_holo_dark" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/scrubber_control_selector_holo.xml b/res/drawable/scrubber_control_selector_holo.xml
deleted file mode 100644
index f53b6b3..0000000
--- a/res/drawable/scrubber_control_selector_holo.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@drawable/scrubber_control_disabled_holo" />
-    <item android:state_pressed="true" android:drawable="@drawable/scrubber_control_pressed_holo" />
-    <item android:state_selected="true" android:drawable="@drawable/scrubber_control_focused_holo" />
-    <item android:drawable="@drawable/scrubber_control_normal_holo" />
-</selector>
diff --git a/res/drawable/scrubber_progress_vertical_holo_dark.xml b/res/drawable/scrubber_progress_vertical_holo_dark.xml
deleted file mode 100644
index 0cc56bf..0000000
--- a/res/drawable/scrubber_progress_vertical_holo_dark.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background"
-            android:drawable="@drawable/scrubber_vertical_track_holo_dark" />
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-                android:drawable="@drawable/scrubber_vertical_secondary_holo" />
-    </item>
-    <item android:id="@android:id/progress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-                android:drawable="@drawable/scrubber_vertical_primary_holo" />
-    </item>
-</layer-list>
diff --git a/res/drawable/scrubber_progress_vertical_holo_light.xml b/res/drawable/scrubber_progress_vertical_holo_light.xml
deleted file mode 100644
index 8a54edf..0000000
--- a/res/drawable/scrubber_progress_vertical_holo_light.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background"
-            android:drawable="@drawable/scrubber_vertical_track_holo_light" />
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-                android:drawable="@drawable/scrubber_vertical_secondary_holo" />
-    </item>
-    <item android:id="@android:id/progress">
-        <scale android:scaleHeight="100%" android:scaleGravity="bottom"
-                android:drawable="@drawable/scrubber_vertical_primary_holo" />
-    </item>
-</layer-list>
diff --git a/res/layout/controls_maxx_audio.xml b/res/layout/controls_maxx_audio.xml
index 410f1a3..9d75cd7 100644
--- a/res/layout/controls_maxx_audio.xml
+++ b/res/layout/controls_maxx_audio.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:custom="http://schemas.android.com/apk/res/com.cyngn.audiofx"
               android:background="@color/knob_container_background"
               android:orientation="vertical"
               android:layout_width="match_parent"
@@ -66,8 +65,7 @@
                     android:layout_width="@dimen/knob_width"
                     android:layout_gravity="top|center_horizontal"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    custom:foreground="@drawable/knob"/>
+                    android:layout_centerHorizontal="true"/>
 
             <ImageView
                     android:id="@+id/label"
@@ -97,8 +95,7 @@
                     android:layout_gravity="top|center_horizontal"
                     android:layout_width="@dimen/knob_width"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    custom:foreground="@drawable/knob"/>
+                    android:layout_centerHorizontal="true"/>
 
             <ImageView
                     android:id="@+id/label"
@@ -128,8 +125,7 @@
                     android:id="@+id/knob"
                     android:layout_gravity="top|center_horizontal"
                     android:layout_width="@dimen/knob_width"
-                    android:layout_height="wrap_content"
-                    custom:foreground="@drawable/knob"/>
+                    android:layout_height="wrap_content"/>
 
 
             <ImageView
diff --git a/res/layout/generic_knob_control.xml b/res/layout/generic_knob_control.xml
index 454e1fb..6d9f531 100644
--- a/res/layout/generic_knob_control.xml
+++ b/res/layout/generic_knob_control.xml
@@ -1,5 +1,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:custom="http://schemas.android.com/apk/res/com.cyngn.audiofx"
              android:layout_width="wrap_content"
              android:layout_height="match_parent"
              android:layout_gravity="center_horizontal"
@@ -10,8 +9,7 @@
             android:id="@+id/knob"
             android:layout_gravity="top|center_horizontal"
             android:layout_width="@dimen/knob_width"
-            android:layout_height="wrap_content"
-            custom:foreground="@drawable/knob"/>
+            android:layout_height="wrap_content"/>
 
     <TextView
             android:id="@+id/label"
diff --git a/res/layout/knob.xml b/res/layout/knob.xml
deleted file mode 100644
index 57030e7..0000000
--- a/res/layout/knob.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:context=".ActivityMusic">
-
-    <ImageView
-        android:id="@+id/knob_foreground"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    <ImageView
-        android:id="@+id/knob_toggle_on"
-        android:layout_gravity="center_horizontal|center_vertical"
-        android:layout_width="21px"
-        android:layout_height="21px"
-        android:src="@drawable/knob_simple"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <TextView
-            android:id="@+id/knob_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-        <TextView
-            android:id="@+id/knob_label"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:textAlignment="center"
-            android:ellipsize="marquee"
-            android:visibility="gone" />
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/res/layout/radial_knob.xml b/res/layout/radial_knob.xml
deleted file mode 100644
index aa1ac9b..0000000
--- a/res/layout/radial_knob.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools"
-
-       tools:context=".ActivityMusic">
-
-        <ImageView
-                android:id="@+id/knob_foreground"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/knob" />
-
-    <ImageView
-            android:id="@+id/indicator"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/indicator" />
-
-        <ImageView
-                android:id="@+id/knob_toggle_on"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-        <TextView
-                android:id="@+id/knob_value"
-                android:layout_gravity="center"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="visible"/>
-</merge>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
deleted file mode 100644
index ff85aad..0000000
--- a/res/values/attrs.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-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.
--->
-
-<resources>
-    <declare-styleable name="Knob">
-        <attr name="background" format="integer" />
-        <attr name="foreground" format="integer" />
-    </declare-styleable>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index aa00e46..a7b4daa 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -74,4 +74,5 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <color name="band_bar_color_selected">#ffffffff</color>
     <color name="knob_container_background">#323437</color>
     <color name="disabled_eq">#ff6c6c6c</color>
+    <color name="radial_knob_arc_bg">#4e5052</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 65b5fef..a08be7d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,7 +39,8 @@
     <dimen name="drag_area_max">200dp</dimen>
     <dimen name="knob_container_padding_bottom">8dp</dimen>
 
-    <dimen name="radial_rect_padding">8dp</dimen>
+    <dimen name="radial_rect_padding">11dp</dimen>
+    <dimen name="radial_text_size">18sp</dimen>
     <dimen name="radial_knob_stroke">22dp</dimen>
 
     <!-- 16 dp + 64 dp -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 843c7a8..319ed7f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,19 +18,6 @@
     <style name="AppTheme" parent="android:Theme.Material">
         <item name="android:windowBackground">@color/window_background</item>
     </style>
-    <style name="Widget.Material.SeekBar.Vertical" parent="@android:Widget.Material.SeekBar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/scrubber_progress_vertical_holo_dark</item>
-        <item name="android:minWidth">33dip</item>
-        <item name="android:maxWidth">33dip</item>
-        <item name="android:thumb">@drawable/scrubber_control_selector_holo</item>
-        <item name="android:thumbOffset">16dip</item>
-        <item name="android:focusable">true</item>
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:paddingRight">0dip</item>
-        <item name="android:paddingTop">16dip</item>
-        <item name="android:paddingBottom">16dip</item>
-    </style>
 
     <style name="AppThemeV2" parent="android:Theme.Material">
         <item name="android:actionBarStyle">@style/ActionBar</item>