diff options
author | Marco Nelissen <marcone@google.com> | 2015-05-22 01:06:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-22 01:06:59 +0000 |
commit | 51b4a870f9de948487fac676c443463392a06218 (patch) | |
tree | 6e81f46023d6999d8769e93383e675c42edb9629 /res | |
parent | 6fedd3d532a52be48bbb95ce3a84b50d4ee9e23a (diff) | |
parent | a3818dbc8cbd1d0ac65ba4f869ccdb100e3db66a (diff) | |
download | MusicFX-51b4a870f9de948487fac676c443463392a06218.tar.gz |
am a3818dbc: Use rotated platform SeekBar instead of custom SeekBar
* commit 'a3818dbc8cbd1d0ac65ba4f869ccdb100e3db66a':
Use rotated platform SeekBar instead of custom SeekBar
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/scrubber_vertical_primary_holo.9.png | bin | 189 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/scrubber_vertical_secondary_holo.9.png | bin | 189 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/scrubber_vertical_track_holo_dark.9.png | bin | 190 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/scrubber_vertical_primary_holo.9.png | bin | 179 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/scrubber_vertical_secondary_holo.9.png | bin | 180 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/scrubber_vertical_track_holo_dark.9.png | bin | 185 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/scrubber_vertical_primary_holo.9.png | bin | 196 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/scrubber_vertical_secondary_holo.9.png | bin | 196 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/scrubber_vertical_track_holo_dark.9.png | bin | 201 -> 0 bytes | |||
-rw-r--r-- | res/drawable/scrubber_progress_vertical_holo_dark.xml | 28 | ||||
-rw-r--r-- | res/layout-land/music_main.xml | 4 | ||||
-rw-r--r-- | res/layout/music_eq.xml | 418 | ||||
-rw-r--r-- | res/layout/music_main.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 32 |
14 files changed, 261 insertions, 225 deletions
diff --git a/res/drawable-hdpi/scrubber_vertical_primary_holo.9.png b/res/drawable-hdpi/scrubber_vertical_primary_holo.9.png Binary files differdeleted file mode 100644 index 03930e2..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 Binary files differdeleted file mode 100644 index a19365c..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 Binary files differdeleted file mode 100644 index 9f12c60..0000000 --- a/res/drawable-hdpi/scrubber_vertical_track_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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted file mode 100644 index 8a7fbde..0000000 --- a/res/drawable-mdpi/scrubber_vertical_track_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 Binary files differdeleted file mode 100644 index 2e4a44b..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 Binary files differdeleted file mode 100644 index a5b1461..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 Binary files differdeleted file mode 100644 index 5f0fc26..0000000 --- a/res/drawable-xhdpi/scrubber_vertical_track_holo_dark.9.png +++ /dev/null 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/layout-land/music_main.xml b/res/layout-land/music_main.xml index 905a602..5153d87 100644 --- a/res/layout-land/music_main.xml +++ b/res/layout-land/music_main.xml @@ -86,7 +86,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:text="@string/bass_boost_strength" /> - <com.android.musicfx.seekbar.SeekBar + <SeekBar android:id="@+id/bBStrengthSeekBar" android:layout_width="170dip" android:layout_height="wrap_content" @@ -117,7 +117,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:text="@string/virtualizer_strength" /> - <com.android.musicfx.seekbar.SeekBar + <SeekBar android:id="@+id/vIStrengthSeekBar" android:layout_width="170dip" android:layout_height="wrap_content" 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" - android:layout_width="wrap_content" - android:layout_height="@dimen/eq_slider_height" /> + <com.android.musicfx.SeekBarRotator + android:layout_width="wrap_content" + 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" diff --git a/res/layout/music_main.xml b/res/layout/music_main.xml index eabe8d9..701b675 100644 --- a/res/layout/music_main.xml +++ b/res/layout/music_main.xml @@ -76,7 +76,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:text="@string/bass_boost_strength" /> - <com.android.musicfx.seekbar.SeekBar + <SeekBar android:id="@+id/bBStrengthSeekBar" android:layout_width="170dip" android:layout_height="wrap_content" @@ -107,7 +107,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:text="@string/virtualizer_strength" /> - <com.android.musicfx.seekbar.SeekBar + <SeekBar android:id="@+id/vIStrengthSeekBar" android:layout_width="170dip" android:layout_height="wrap_content" diff --git a/res/values/styles.xml b/res/values/styles.xml deleted file mode 100644 index f92c230..0000000 --- a/res/values/styles.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<resources> - <style name="Widget.Holo.SeekBar.Vertical" parent="@android:Widget.Holo.SeekBar"> - <item name="android:indeterminateOnly">false</item> - <item name="android:progressDrawable">@drawable/scrubber_progress_vertical_holo_dark</item> -<!-- not public <item name="android:indeterminateDrawable">@android:drawable/scrubber_progress_horizontal_holo_dark</item> --> - <item name="android:minWidth">33dip</item> - <item name="android:maxWidth">33dip</item> -<!-- not public <item name="android:thumb">@android: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> -</resources> |