FP2-1995: MusicFX: Integrate latest AOSP fixes and improvements

Merge branch 'marshmallow-mr2-release' into HEAD

Change-Id: Ib1d54fad1a5284c9b455201988c705efd15a1194
diff --git a/res/layout/music_eq.xml b/res/layout/music_eq.xml
index 1af4c9d..309a34d 100644
--- a/res/layout/music_eq.xml
+++ b/res/layout/music_eq.xml
@@ -55,12 +55,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand0SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand0SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand0TextView"
             android:layout_width="50dip"
@@ -71,12 +74,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand1SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand1SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand1TextView"
             android:layout_width="50dip"
@@ -87,12 +93,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand2SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand2SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand2TextView"
             android:layout_width="50dip"
@@ -103,12 +112,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand3SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand3SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand3TextView"
             android:layout_width="50dip"
@@ -119,12 +131,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand4SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand4SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand4TextView"
             android:layout_width="50dip"
@@ -135,12 +150,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand5SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand5SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand5TextView"
             android:layout_width="50dip"
@@ -151,12 +169,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand6SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand6SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand6TextView"
             android:layout_width="50dip"
@@ -167,12 +188,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand7SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand7SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand7TextView"
             android:layout_width="50dip"
@@ -183,12 +207,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand8SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand8SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand8TextView"
             android:layout_width="50dip"
@@ -199,12 +226,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand9SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand9SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand9TextView"
             android:layout_width="50dip"
@@ -215,12 +245,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand10SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand10SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand10TextView"
             android:layout_width="50dip"
@@ -231,12 +264,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand11SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand11SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand11TextView"
             android:layout_width="50dip"
@@ -247,12 +283,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand12SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand12SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand12TextView"
             android:layout_width="50dip"
@@ -263,12 +302,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand13SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand13SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand13TextView"
             android:layout_width="50dip"
@@ -279,12 +321,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand14SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand14SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand14TextView"
             android:layout_width="50dip"
@@ -295,12 +340,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand15SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand15SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand15TextView"
             android:layout_width="50dip"
@@ -311,12 +359,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand16SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand16SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand16TextView"
             android:layout_width="50dip"
@@ -327,12 +378,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand17SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand17SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand17TextView"
             android:layout_width="50dip"
@@ -343,12 +397,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand18SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand18SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand18TextView"
             android:layout_width="50dip"
@@ -359,12 +416,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand19SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand19SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand19TextView"
             android:layout_width="50dip"
@@ -375,12 +435,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand20SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand20SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand20TextView"
             android:layout_width="50dip"
@@ -391,12 +454,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand21SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand21SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand21TextView"
             android:layout_width="50dip"
@@ -407,12 +473,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand22SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand22SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand22TextView"
             android:layout_width="50dip"
@@ -423,12 +492,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand23SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand23SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand23TextView"
             android:layout_width="50dip"
@@ -439,12 +511,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand24SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand24SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand24TextView"
             android:layout_width="50dip"
@@ -455,12 +530,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand25SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand25SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand25TextView"
             android:layout_width="50dip"
@@ -471,12 +549,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand26SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand26SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand26TextView"
             android:layout_width="50dip"
@@ -487,12 +568,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand27SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand27SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand27TextView"
             android:layout_width="50dip"
@@ -503,12 +587,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand28SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand28SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand28TextView"
             android:layout_width="50dip"
@@ -519,12 +606,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand29SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand29SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand29TextView"
             android:layout_width="50dip"
@@ -535,12 +625,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand30SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand30SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand30TextView"
             android:layout_width="50dip"
@@ -551,12 +644,15 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
-        <com.android.musicfx.seekbar.SeekBar
-            android:id="@+id/EQBand31SeekBar"
-            style="@style/Widget.Holo.SeekBar.Vertical"
-            android:layout_margin="@dimen/eq_slider_margin"
+        <com.android.musicfx.SeekBarRotator
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/eq_slider_height" />
+            android:layout_height="@dimen/eq_slider_height">
+            <SeekBar
+                android:id="@+id/EQBand31SeekBar"
+                android:layout_margin="@dimen/eq_slider_margin"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.android.musicfx.SeekBarRotator>
         <TextView
             android:id="@+id/EQBand31TextView"
             android:layout_width="50dip"