File layout cleanup.

484 files changed, 3235 insertions, 3290 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 97fbb61..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin

-gen
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/Android.mk b/Android.mk
index d2b7691..d2b7691 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/Android.mk
+++ b/Android.mk
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/AndroidManifest.xml b/AndroidManifest.xml
index 26505ef..26505ef 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/AndroidManifest.xml
+++ b/AndroidManifest.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..b84e1b6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/CleanSpec.mk
+++ b/CleanSpec.mk
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/.classpath b/CyanogenMod-android_packages_apps_Music-41e85d6/.classpath
deleted file mode 100644
index 8531be1..0000000
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" path="gen"/>

-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>

-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>

-	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>

-	<classpathentry kind="output" path="bin/classes"/>

-</classpath>

diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/.project b/CyanogenMod-android_packages_apps_Music-41e85d6/.project
deleted file mode 100644
index 25e9b4c..0000000
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>Music</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/project.properties b/CyanogenMod-android_packages_apps_Music-41e85d6/project.properties
deleted file mode 100644
index 8da376a..0000000
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-15
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
index e69de29..e69de29 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/MODULE_LICENSE_APACHE2
+++ b/MODULE_LICENSE_APACHE2
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/NOTICE b/NOTICE
index c5b1efa..c5b1efa 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/NOTICE
+++ b/NOTICE
diff --git a/README b/README
deleted file mode 100644
index e69de29..0000000
--- a/README
+++ /dev/null
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/libs/android-support-v4.jar b/libs/android-support-v4.jar
index d006198..d006198 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/libs/android-support-v4.jar
+++ b/libs/android-support-v4.jar
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/proguard.flags b/proguard.flags
index 8d4db53..8d4db53 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/proguard.flags
+++ b/proguard.flags
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_0.xml b/res/anim/anim_0.xml
index 041113c..3cf4b57 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_0.xml
+++ b/res/anim/anim_0.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <scale

-        android:duration="200"

-        android:fromXScale="2.0"

-        android:fromYScale="0.0"

-        android:pivotX="50.0%"

-        android:pivotY="50.0%"

-        android:toXScale="1.0"

-        android:toYScale="1.0" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <scale
+        android:duration="200"
+        android:fromXScale="2.0"
+        android:fromYScale="0.0"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_1.xml b/res/anim/anim_1.xml
index ac13fce..490de90 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_1.xml
+++ b/res/anim/anim_1.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <scale

-        android:duration="200"

-        android:fromXScale="2.0"

-        android:fromYScale="0.0"

-        android:pivotX="0.0%"

-        android:pivotY="50.0%"

-        android:toXScale="1.0"

-        android:toYScale="1.0" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <scale
+        android:duration="200"
+        android:fromXScale="2.0"
+        android:fromYScale="0.0"
+        android:pivotX="0.0%"
+        android:pivotY="50.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_2.xml b/res/anim/anim_2.xml
index f1d15a6..b7c3e33 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_2.xml
+++ b/res/anim/anim_2.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <scale

-        android:duration="200"

-        android:fromXScale="2.0"

-        android:fromYScale="0.0"

-        android:pivotX="00.0%"

-        android:pivotY="00.0%"

-        android:toXScale="1.0"

-        android:toYScale="1.0" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <scale
+        android:duration="200"
+        android:fromXScale="2.0"
+        android:fromYScale="0.0"
+        android:pivotX="00.0%"
+        android:pivotY="00.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_3.xml b/res/anim/anim_3.xml
index 7bda84b..5777b1d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_3.xml
+++ b/res/anim/anim_3.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <scale

-        android:duration="200"

-        android:fromXScale="0.0"

-        android:fromYScale="2.0"

-        android:pivotX="50.0%"

-        android:pivotY="00.0%"

-        android:toXScale="1.0"

-        android:toYScale="1.0" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <scale
+        android:duration="200"
+        android:fromXScale="0.0"
+        android:fromYScale="2.0"
+        android:pivotX="50.0%"
+        android:pivotY="00.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_4.xml b/res/anim/anim_4.xml
index fda1a48..8b33102 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_4.xml
+++ b/res/anim/anim_4.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <translate

-        android:duration="@android:integer/config_shortAnimTime"

-        android:fromYDelta="-50.0%p"

-        android:toYDelta="0.0" />

-

-    <alpha

-        android:duration="@android:integer/config_longAnimTime"

-        android:fromAlpha="0.0"

-        android:toAlpha="1.0" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="@android:integer/config_shortAnimTime"
+        android:fromYDelta="-50.0%p"
+        android:toYDelta="0.0" />
+
+    <alpha
+        android:duration="@android:integer/config_longAnimTime"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_5.xml b/res/anim/anim_5.xml
index 8326cf7..29613ab 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/anim_5.xml
+++ b/res/anim/anim_5.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-/* //device/apps/common/res/anim/slide_in_right.xml

-**

-** Copyright 2007, 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.

-*/

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-        <translate android:fromXDelta="50%p" android:toXDelta="0"

-            android:duration="@android:integer/config_mediumAnimTime"/>

-        <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

-            android:duration="@android:integer/config_mediumAnimTime" />

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_in_right.xml
+**
+** Copyright 2007, 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.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+        <translate android:fromXDelta="50%p" android:toXDelta="0"
+            android:duration="@android:integer/config_mediumAnimTime"/>
+        <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+            android:duration="@android:integer/config_mediumAnimTime" />
 </set>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/fade_in_fast.xml b/res/anim/fade_in_fast.xml
index a545430..a545430 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/fade_in_fast.xml
+++ b/res/anim/fade_in_fast.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/fade_out_fast.xml b/res/anim/fade_out_fast.xml
index 9d41aea..d946318 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/fade_out_fast.xml
+++ b/res/anim/fade_out_fast.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2009 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.

--->

-

-<alpha xmlns:android="http://schemas.android.com/apk/res/android"

-    android:interpolator="@android:anim/accelerate_interpolator"

-

-    android:fromAlpha="1.0"

-    android:toAlpha="0.0"

-

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+
     android:duration="@android:integer/config_mediumAnimTime" />
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/peak_meter.xml b/res/anim/peak_meter.xml
index 69b46a8..e601eab 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/peak_meter.xml
+++ b/res/anim/peak_meter.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>

-<animation-list android:oneshot="false"

-  xmlns:android="http://schemas.android.com/apk/res/android">

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_1" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_5" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_1" />

-    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />

-</animation-list>

+<?xml version="1.0" encoding="utf-8"?>
+<animation-list android:oneshot="false"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_1" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_5" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_4" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_2" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_1" />
+    <item android:duration="200" android:drawable="@drawable/indicator_playing_peak_meter_3" />
+</animation-list>
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml
index f59d6d4..f59d6d4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_in_left.xml
+++ b/res/anim/slide_in_left.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml
index 178ca02..178ca02 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_in_right.xml
+++ b/res/anim/slide_in_right.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_out_left.xml b/res/anim/slide_out_left.xml
index 0f2b154..0f2b154 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_out_left.xml
+++ b/res/anim/slide_out_left.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml
index 9c0affb..9c0affb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/anim/slide_out_right.xml
+++ b/res/anim/slide_out_right.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/color/tab_indicator_text.xml b/res/color/tab_indicator_text.xml
index 62f522b..62f522b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/color/tab_indicator_text.xml
+++ b/res/color/tab_indicator_text.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/albumart_mp_unknown.png b/res/drawable-hdpi/albumart_mp_unknown.png
index ab88184..ab88184 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/albumart_mp_unknown.png
+++ b/res/drawable-hdpi/albumart_mp_unknown.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/albumart_mp_unknown_list.png b/res/drawable-hdpi/albumart_mp_unknown_list.png
index 5c3a380..5c3a380 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/albumart_mp_unknown_list.png
+++ b/res/drawable-hdpi/albumart_mp_unknown_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/app_music.png b/res/drawable-hdpi/app_music.png
index 5293d13..5293d13 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/app_music.png
+++ b/res/drawable-hdpi/app_music.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/app_video.png b/res/drawable-hdpi/app_video.png
index df2f832..df2f832 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/app_video.png
+++ b/res/drawable-hdpi/app_video.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
index 02ee440..02ee440 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_bg.9.png
+++ b/res/drawable-hdpi/appwidget_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_divider.9.png b/res/drawable-hdpi/appwidget_divider.9.png
index 02b4b8b..02b4b8b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_divider.9.png
+++ b/res/drawable-hdpi/appwidget_divider.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_pause_normal.png b/res/drawable-hdpi/appwidget_pause_normal.png
index d6aac45..d6aac45 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_pause_normal.png
+++ b/res/drawable-hdpi/appwidget_pause_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_play_normal.png b/res/drawable-hdpi/appwidget_play_normal.png
index 082b0db..082b0db 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/appwidget_play_normal.png
+++ b/res/drawable-hdpi/appwidget_play_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/background_texture.png b/res/drawable-hdpi/background_texture.png
index 879e7f3..879e7f3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/background_texture.png
+++ b/res/drawable-hdpi/background_texture.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/bg_stripes.png b/res/drawable-hdpi/bg_stripes.png
index 6db6317..6db6317 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/bg_stripes.png
+++ b/res/drawable-hdpi/bg_stripes.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png b/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png
index 848ce0d..848ce0d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png
+++ b/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_context_menu.png b/res/drawable-hdpi/btn_context_menu.png
index e436157..e436157 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_context_menu.png
+++ b/res/drawable-hdpi/btn_context_menu.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_context_menu_child.png b/res/drawable-hdpi/btn_context_menu_child.png
index d265814..d265814 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_context_menu_child.png
+++ b/res/drawable-hdpi/btn_context_menu_child.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_ic_pause_small.png b/res/drawable-hdpi/btn_playback_ic_pause_small.png
index 4f0fb16..4f0fb16 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_ic_pause_small.png
+++ b/res/drawable-hdpi/btn_playback_ic_pause_small.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_ic_play_small.png b/res/drawable-hdpi/btn_playback_ic_play_small.png
index 984dd8e..984dd8e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_ic_play_small.png
+++ b/res/drawable-hdpi/btn_playback_ic_play_small.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_normal.png b/res/drawable-hdpi/btn_playback_small_normal.png
index c77d085..c77d085 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_normal.png
+++ b/res/drawable-hdpi/btn_playback_small_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_pressed.png b/res/drawable-hdpi/btn_playback_small_pressed.png
index 8025238..8025238 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_pressed.png
+++ b/res/drawable-hdpi/btn_playback_small_pressed.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_selected.png b/res/drawable-hdpi/btn_playback_small_selected.png
index 5bf40e7..5bf40e7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_playback_small_selected.png
+++ b/res/drawable-hdpi/btn_playback_small_selected.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_blue.png b/res/drawable-hdpi/btn_tab_blue.png
index 542b327..542b327 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_blue.png
+++ b/res/drawable-hdpi/btn_tab_blue.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_default.png b/res/drawable-hdpi/btn_tab_default.png
index 2fd247c..2fd247c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_default.png
+++ b/res/drawable-hdpi/btn_tab_default.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_selected.png b/res/drawable-hdpi/btn_tab_selected.png
index ec406b9..ec406b9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/btn_tab_selected.png
+++ b/res/drawable-hdpi/btn_tab_selected.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_active.9.png b/res/drawable-hdpi/buttonbar_active.9.png
index f036b9a..f036b9a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_active.9.png
+++ b/res/drawable-hdpi/buttonbar_active.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_focused.9.png b/res/drawable-hdpi/buttonbar_focused.9.png
index 6e8a71f..6e8a71f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_focused.9.png
+++ b/res/drawable-hdpi/buttonbar_focused.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_inactive.9.png b/res/drawable-hdpi/buttonbar_inactive.9.png
index c3a1f30..c3a1f30 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_inactive.9.png
+++ b/res/drawable-hdpi/buttonbar_inactive.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_pressed.9.png b/res/drawable-hdpi/buttonbar_pressed.9.png
index 119b2c6..119b2c6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/buttonbar_pressed.9.png
+++ b/res/drawable-hdpi/buttonbar_pressed.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/easter_egg.png b/res/drawable-hdpi/easter_egg.png
index 43dcbb5..43dcbb5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/easter_egg.png
+++ b/res/drawable-hdpi/easter_egg.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_ab_search_holo_dark.png b/res/drawable-hdpi/ic_ab_search_holo_dark.png
index 3c13e05..3c13e05 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_ab_search_holo_dark.png
+++ b/res/drawable-hdpi/ic_ab_search_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_next.png b/res/drawable-hdpi/ic_appwidget_music_next.png
index 99d2876..99d2876 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_next.png
+++ b/res/drawable-hdpi/ic_appwidget_music_next.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_pause.png b/res/drawable-hdpi/ic_appwidget_music_pause.png
index a05a8c5..a05a8c5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_pause.png
+++ b/res/drawable-hdpi/ic_appwidget_music_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_play.png b/res/drawable-hdpi/ic_appwidget_music_play.png
index a754b92..a754b92 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_play.png
+++ b/res/drawable-hdpi/ic_appwidget_music_play.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_prev.png b/res/drawable-hdpi/ic_appwidget_music_prev.png
index 6f31c61..6f31c61 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_appwidget_music_prev.png
+++ b/res/drawable-hdpi/ic_appwidget_music_prev.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_dialog_alert_holo_dark.png b/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
index f0ba889..f0ba889 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_flip.png b/res/drawable-hdpi/ic_flip.png
index 964f605..964f605 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_flip.png
+++ b/res/drawable-hdpi/ic_flip.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_launcher_market_holo.png b/res/drawable-hdpi/ic_launcher_market_holo.png
index cd8ac0b..cd8ac0b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_launcher_market_holo.png
+++ b/res/drawable-hdpi/ic_launcher_market_holo.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png b/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png
index 910c654..910c654 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png
+++ b/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_market.png b/res/drawable-hdpi/ic_market.png
index 0276077..0276077 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_market.png
+++ b/res/drawable-hdpi/ic_market.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_next.png b/res/drawable-hdpi/ic_media_next.png
index c689e2e..c689e2e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_next.png
+++ b/res/drawable-hdpi/ic_media_next.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_pause.png b/res/drawable-hdpi/ic_media_pause.png
index 830981c..830981c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_pause.png
+++ b/res/drawable-hdpi/ic_media_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_play.png b/res/drawable-hdpi/ic_media_play.png
index a2dd6e9..a2dd6e9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_play.png
+++ b/res/drawable-hdpi/ic_media_play.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_previous.png b/res/drawable-hdpi/ic_media_previous.png
index b4d4322..b4d4322 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_media_previous.png
+++ b/res/drawable-hdpi/ic_media_previous.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
index 2dd91b9..2dd91b9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_add.png
+++ b/res/drawable-hdpi/ic_menu_add.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_add_playlist.png b/res/drawable-hdpi/ic_menu_add_playlist.png
index 3520c91..3520c91 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_add_playlist.png
+++ b/res/drawable-hdpi/ic_menu_add_playlist.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_delete.png b/res/drawable-hdpi/ic_menu_delete.png
index c970c65..c970c65 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_delete.png
+++ b/res/drawable-hdpi/ic_menu_delete.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_eq.png b/res/drawable-hdpi/ic_menu_eq.png
index dd6b64c..dd6b64c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_eq.png
+++ b/res/drawable-hdpi/ic_menu_eq.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png
index 39bdcb7..39bdcb7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png
index 2d69195..2d69195 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_share.png
+++ b/res/drawable-hdpi/ic_menu_share.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_artist_list.png b/res/drawable-hdpi/ic_mp_artist_list.png
index 6b82c3d..6b82c3d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_artist_list.png
+++ b/res/drawable-hdpi/ic_mp_artist_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_partyshuffle_on_btn.png b/res/drawable-hdpi/ic_mp_partyshuffle_on_btn.png
index 17c3f07..17c3f07 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_partyshuffle_on_btn.png
+++ b/res/drawable-hdpi/ic_mp_partyshuffle_on_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_playlist_list.png b/res/drawable-hdpi/ic_mp_playlist_list.png
index 94dadf1..94dadf1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_playlist_list.png
+++ b/res/drawable-hdpi/ic_mp_playlist_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_playlist_recently_added_list.png b/res/drawable-hdpi/ic_mp_playlist_recently_added_list.png
index 3082e15..3082e15 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_playlist_recently_added_list.png
+++ b/res/drawable-hdpi/ic_mp_playlist_recently_added_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_all_btn.png b/res/drawable-hdpi/ic_mp_repeat_all_btn.png
index 30eb72a..30eb72a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_all_btn.png
+++ b/res/drawable-hdpi/ic_mp_repeat_all_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_off_btn.png b/res/drawable-hdpi/ic_mp_repeat_off_btn.png
index 8b313cc..8b313cc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_off_btn.png
+++ b/res/drawable-hdpi/ic_mp_repeat_off_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_once_btn.png b/res/drawable-hdpi/ic_mp_repeat_once_btn.png
index 15e5857..15e5857 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_repeat_once_btn.png
+++ b/res/drawable-hdpi/ic_mp_repeat_once_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_sd_card.png b/res/drawable-hdpi/ic_mp_sd_card.png
index fa05320..fa05320 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_sd_card.png
+++ b/res/drawable-hdpi/ic_mp_sd_card.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_shuffle_off_btn.png b/res/drawable-hdpi/ic_mp_shuffle_off_btn.png
index 0a9cbac..0a9cbac 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_shuffle_off_btn.png
+++ b/res/drawable-hdpi/ic_mp_shuffle_off_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_shuffle_on_btn.png b/res/drawable-hdpi/ic_mp_shuffle_on_btn.png
index 702e896..702e896 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_shuffle_on_btn.png
+++ b/res/drawable-hdpi/ic_mp_shuffle_on_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_song_list.png b/res/drawable-hdpi/ic_mp_song_list.png
index e86fdf3..e86fdf3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_mp_song_list.png
+++ b/res/drawable-hdpi/ic_mp_song_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_ring.png b/res/drawable-hdpi/ic_ring.png
index c170e2b..c170e2b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_ring.png
+++ b/res/drawable-hdpi/ic_ring.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_shake.png b/res/drawable-hdpi/ic_shake.png
index 4199106..4199106 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_shake.png
+++ b/res/drawable-hdpi/ic_shake.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_slide_keyboard.png b/res/drawable-hdpi/ic_slide_keyboard.png
index fc75cff..fc75cff 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_slide_keyboard.png
+++ b/res/drawable-hdpi/ic_slide_keyboard.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_0.png b/res/drawable-hdpi/indicator_playing_peak_meter_0.png
index 4bb81cb..4bb81cb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_0.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_0.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_1.png b/res/drawable-hdpi/indicator_playing_peak_meter_1.png
index 60c58e6..60c58e6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_1.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_1.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_2.png b/res/drawable-hdpi/indicator_playing_peak_meter_2.png
index f58cb3d..f58cb3d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_2.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_2.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_3.png b/res/drawable-hdpi/indicator_playing_peak_meter_3.png
index 0188041..0188041 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_3.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_3.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_4.png b/res/drawable-hdpi/indicator_playing_peak_meter_4.png
index 0898e1a..0898e1a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_4.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_4.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_5.png b/res/drawable-hdpi/indicator_playing_peak_meter_5.png
index e116eb5..e116eb5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/indicator_playing_peak_meter_5.png
+++ b/res/drawable-hdpi/indicator_playing_peak_meter_5.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/media_next_normal.png b/res/drawable-hdpi/media_next_normal.png
index 454c2ad..454c2ad 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/media_next_normal.png
+++ b/res/drawable-hdpi/media_next_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/media_previous_normal.png b/res/drawable-hdpi/media_previous_normal.png
index 6b3aedb..6b3aedb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/media_previous_normal.png
+++ b/res/drawable-hdpi/media_previous_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/midi.png b/res/drawable-hdpi/midi.png
index 9d3bf5b..9d3bf5b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/midi.png
+++ b/res/drawable-hdpi/midi.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/movie.png b/res/drawable-hdpi/movie.png
index 85a8a62..85a8a62 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/movie.png
+++ b/res/drawable-hdpi/movie.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/music_bottom_playback_bg.9.png b/res/drawable-hdpi/music_bottom_playback_bg.9.png
index df5bb44..df5bb44 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/music_bottom_playback_bg.9.png
+++ b/res/drawable-hdpi/music_bottom_playback_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/res/drawable-hdpi/notify_panel_notification_icon_bg.png
index 6f37a22..6f37a22 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/notify_panel_notification_icon_bg.png
+++ b/res/drawable-hdpi/notify_panel_notification_icon_bg.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_bg.png b/res/drawable-hdpi/now_playing_bg.png
index 24059f8..24059f8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_bg.png
+++ b/res/drawable-hdpi/now_playing_bg.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_normal.png b/res/drawable-hdpi/now_playing_progress_handle_normal.png
index d7c02e4..d7c02e4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_normal.png
+++ b/res/drawable-hdpi/now_playing_progress_handle_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_pressed.png b/res/drawable-hdpi/now_playing_progress_handle_pressed.png
index 1f779da..1f779da 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_pressed.png
+++ b/res/drawable-hdpi/now_playing_progress_handle_pressed.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_selected.png b/res/drawable-hdpi/now_playing_progress_handle_selected.png
index ee14d1a..ee14d1a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/now_playing_progress_handle_selected.png
+++ b/res/drawable-hdpi/now_playing_progress_handle_selected.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/panel_now_playing_progress_bg.9.png b/res/drawable-hdpi/panel_now_playing_progress_bg.9.png
index 06a99a0..06a99a0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/panel_now_playing_progress_bg.9.png
+++ b/res/drawable-hdpi/panel_now_playing_progress_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_background.9.png b/res/drawable-hdpi/pickerbox_background.9.png
index fcb4989..fcb4989 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_background.9.png
+++ b/res/drawable-hdpi/pickerbox_background.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_selected.9.png b/res/drawable-hdpi/pickerbox_selected.9.png
index a88ec63..a88ec63 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_selected.9.png
+++ b/res/drawable-hdpi/pickerbox_selected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_unselected.9.png b/res/drawable-hdpi/pickerbox_unselected.9.png
index 9f6b7cb..9f6b7cb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/pickerbox_unselected.9.png
+++ b/res/drawable-hdpi/pickerbox_unselected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_drag.9.png b/res/drawable-hdpi/playlist_tile_drag.9.png
index 646c2eb..646c2eb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_drag.9.png
+++ b/res/drawable-hdpi/playlist_tile_drag.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_longpress.9.png b/res/drawable-hdpi/playlist_tile_longpress.9.png
index 6a36787..6a36787 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_longpress.9.png
+++ b/res/drawable-hdpi/playlist_tile_longpress.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_normal.9.png b/res/drawable-hdpi/playlist_tile_normal.9.png
index 2ca07f9..2ca07f9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_normal.9.png
+++ b/res/drawable-hdpi/playlist_tile_normal.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_pressed.9.png b/res/drawable-hdpi/playlist_tile_pressed.9.png
index fc9cbaf..fc9cbaf 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_pressed.9.png
+++ b/res/drawable-hdpi/playlist_tile_pressed.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_selected.9.png b/res/drawable-hdpi/playlist_tile_selected.9.png
index 77e36f8..77e36f8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/playlist_tile_selected.9.png
+++ b/res/drawable-hdpi/playlist_tile_selected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_bg_holo_dark.9.png b/res/drawable-hdpi/progress_bg_holo_dark.9.png
index 310c368..310c368 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_bg_holo_dark.9.png
+++ b/res/drawable-hdpi/progress_bg_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_primary_holo_dark.9.png b/res/drawable-hdpi/progress_primary_holo_dark.9.png
index 1c26920..1c26920 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_primary_holo_dark.9.png
+++ b/res/drawable-hdpi/progress_primary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_secondary_holo_dark.9.png b/res/drawable-hdpi/progress_secondary_holo_dark.9.png
index 40d0d16..40d0d16 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/progress_secondary_holo_dark.9.png
+++ b/res/drawable-hdpi/progress_secondary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/solid_dark_pressed.png b/res/drawable-hdpi/solid_dark_pressed.png
index 55b2567..55b2567 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/solid_dark_pressed.png
+++ b/res/drawable-hdpi/solid_dark_pressed.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/stat_notify_musicplayer.png b/res/drawable-hdpi/stat_notify_musicplayer.png
index 00b58e2..00b58e2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/stat_notify_musicplayer.png
+++ b/res/drawable-hdpi/stat_notify_musicplayer.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_next.png b/res/drawable-hdpi/status_next.png
index 5835f65..5835f65 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_next.png
+++ b/res/drawable-hdpi/status_next.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_pause.png b/res/drawable-hdpi/status_pause.png
index 3324f88..3324f88 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_pause.png
+++ b/res/drawable-hdpi/status_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_play.png b/res/drawable-hdpi/status_play.png
index 8c95b6a..8c95b6a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_play.png
+++ b/res/drawable-hdpi/status_play.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_prev.png b/res/drawable-hdpi/status_prev.png
index 73fb16f..73fb16f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/status_prev.png
+++ b/res/drawable-hdpi/status_prev.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-land-hdpi/albumart_mp_unknown.png b/res/drawable-land-hdpi/albumart_mp_unknown.png
index 8d1e861..8d1e861 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-land-hdpi/albumart_mp_unknown.png
+++ b/res/drawable-land-hdpi/albumart_mp_unknown.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-land-mdpi/albumart_mp_unknown.png b/res/drawable-land-mdpi/albumart_mp_unknown.png
index ed6c969..ed6c969 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-land-mdpi/albumart_mp_unknown.png
+++ b/res/drawable-land-mdpi/albumart_mp_unknown.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/album_border_large.9.png b/res/drawable-mdpi/album_border_large.9.png
index e5ffbc7..e5ffbc7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/album_border_large.9.png
+++ b/res/drawable-mdpi/album_border_large.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/albumart_mp_unknown.png b/res/drawable-mdpi/albumart_mp_unknown.png
index f014a45..f014a45 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/albumart_mp_unknown.png
+++ b/res/drawable-mdpi/albumart_mp_unknown.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/albumart_mp_unknown_list.png b/res/drawable-mdpi/albumart_mp_unknown_list.png
index ac11762..ac11762 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/albumart_mp_unknown_list.png
+++ b/res/drawable-mdpi/albumart_mp_unknown_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/app_music.png b/res/drawable-mdpi/app_music.png
index fda32db..fda32db 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/app_music.png
+++ b/res/drawable-mdpi/app_music.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/app_video.png b/res/drawable-mdpi/app_video.png
index 6f77659..6f77659 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/app_video.png
+++ b/res/drawable-mdpi/app_video.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
index a245d91..a245d91 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/appwidget_bg.9.png
+++ b/res/drawable-mdpi/appwidget_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/appwidget_divider.9.png b/res/drawable-mdpi/appwidget_divider.9.png
index 64cf53e..64cf53e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/appwidget_divider.9.png
+++ b/res/drawable-mdpi/appwidget_divider.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/btn_collapse_group_normal_holo_dark.png b/res/drawable-mdpi/btn_collapse_group_normal_holo_dark.png
index 2faf228..2faf228 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/btn_collapse_group_normal_holo_dark.png
+++ b/res/drawable-mdpi/btn_collapse_group_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_active.9.png b/res/drawable-mdpi/buttonbar_active.9.png
index 54190ea..54190ea 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_active.9.png
+++ b/res/drawable-mdpi/buttonbar_active.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_focused.9.png b/res/drawable-mdpi/buttonbar_focused.9.png
index d9bcc57..d9bcc57 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_focused.9.png
+++ b/res/drawable-mdpi/buttonbar_focused.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_inactive.9.png b/res/drawable-mdpi/buttonbar_inactive.9.png
index 1b8a69c..1b8a69c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_inactive.9.png
+++ b/res/drawable-mdpi/buttonbar_inactive.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_pressed.9.png b/res/drawable-mdpi/buttonbar_pressed.9.png
index 3332660..3332660 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/buttonbar_pressed.9.png
+++ b/res/drawable-mdpi/buttonbar_pressed.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_next.png b/res/drawable-mdpi/ic_appwidget_music_next.png
index abc8e47..abc8e47 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_next.png
+++ b/res/drawable-mdpi/ic_appwidget_music_next.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_pause.png b/res/drawable-mdpi/ic_appwidget_music_pause.png
index 25a2d38..25a2d38 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_pause.png
+++ b/res/drawable-mdpi/ic_appwidget_music_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_play.png b/res/drawable-mdpi/ic_appwidget_music_play.png
index 52b8e45..52b8e45 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_appwidget_music_play.png
+++ b/res/drawable-mdpi/ic_appwidget_music_play.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_dialog_alert_holo_dark.png b/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
index 75d9db7..75d9db7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png b/res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png
index dc6ad18..dc6ad18 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png
+++ b/res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_media_pause.png b/res/drawable-mdpi/ic_media_pause.png
index 0930fa2..0930fa2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_media_pause.png
+++ b/res/drawable-mdpi/ic_media_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
index ba704b6..ba704b6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ b/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_artist_list.png b/res/drawable-mdpi/ic_mp_artist_list.png
index 08cd205..08cd205 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_artist_list.png
+++ b/res/drawable-mdpi/ic_mp_artist_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_partyshuffle_on_btn.png b/res/drawable-mdpi/ic_mp_partyshuffle_on_btn.png
index 56bf3ee..56bf3ee 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_partyshuffle_on_btn.png
+++ b/res/drawable-mdpi/ic_mp_partyshuffle_on_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_playlist_list.png b/res/drawable-mdpi/ic_mp_playlist_list.png
index 1fba256..1fba256 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_playlist_list.png
+++ b/res/drawable-mdpi/ic_mp_playlist_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_playlist_recently_added_list.png b/res/drawable-mdpi/ic_mp_playlist_recently_added_list.png
index bc2cb79..bc2cb79 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_playlist_recently_added_list.png
+++ b/res/drawable-mdpi/ic_mp_playlist_recently_added_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_all_btn.png b/res/drawable-mdpi/ic_mp_repeat_all_btn.png
index a9dc137..a9dc137 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_all_btn.png
+++ b/res/drawable-mdpi/ic_mp_repeat_all_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_off_btn.png b/res/drawable-mdpi/ic_mp_repeat_off_btn.png
index cdf6192..cdf6192 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_off_btn.png
+++ b/res/drawable-mdpi/ic_mp_repeat_off_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_once_btn.png b/res/drawable-mdpi/ic_mp_repeat_once_btn.png
index a828e00..a828e00 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_repeat_once_btn.png
+++ b/res/drawable-mdpi/ic_mp_repeat_once_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_sd_card.png b/res/drawable-mdpi/ic_mp_sd_card.png
index 90e5081..90e5081 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_sd_card.png
+++ b/res/drawable-mdpi/ic_mp_sd_card.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_shuffle_off_btn.png b/res/drawable-mdpi/ic_mp_shuffle_off_btn.png
index 9530a3e..9530a3e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_shuffle_off_btn.png
+++ b/res/drawable-mdpi/ic_mp_shuffle_off_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_shuffle_on_btn.png b/res/drawable-mdpi/ic_mp_shuffle_on_btn.png
index 09e9d53..09e9d53 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_shuffle_on_btn.png
+++ b/res/drawable-mdpi/ic_mp_shuffle_on_btn.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_song_list.png b/res/drawable-mdpi/ic_mp_song_list.png
index 804a2ee..804a2ee 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_mp_song_list.png
+++ b/res/drawable-mdpi/ic_mp_song_list.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_slide_keyboard.png b/res/drawable-mdpi/ic_slide_keyboard.png
index 38a7dbf..38a7dbf 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_slide_keyboard.png
+++ b/res/drawable-mdpi/ic_slide_keyboard.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/midi.png b/res/drawable-mdpi/midi.png
index 87f32ac..87f32ac 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/midi.png
+++ b/res/drawable-mdpi/midi.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/movie.png b/res/drawable-mdpi/movie.png
index bed7c78..bed7c78 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/movie.png
+++ b/res/drawable-mdpi/movie.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/music_bottom_playback_bg.9.png b/res/drawable-mdpi/music_bottom_playback_bg.9.png
index 3c59e90..3c59e90 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/music_bottom_playback_bg.9.png
+++ b/res/drawable-mdpi/music_bottom_playback_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_normal.png b/res/drawable-mdpi/now_playing_progress_handle_normal.png
index 92b6231..92b6231 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_normal.png
+++ b/res/drawable-mdpi/now_playing_progress_handle_normal.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_pressed.png b/res/drawable-mdpi/now_playing_progress_handle_pressed.png
index b6441c0..b6441c0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_pressed.png
+++ b/res/drawable-mdpi/now_playing_progress_handle_pressed.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_selected.png b/res/drawable-mdpi/now_playing_progress_handle_selected.png
index d745a59..d745a59 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/now_playing_progress_handle_selected.png
+++ b/res/drawable-mdpi/now_playing_progress_handle_selected.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/panel_now_playing_progress_bg.9.png b/res/drawable-mdpi/panel_now_playing_progress_bg.9.png
index 1486903..1486903 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/panel_now_playing_progress_bg.9.png
+++ b/res/drawable-mdpi/panel_now_playing_progress_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_background.9.png b/res/drawable-mdpi/pickerbox_background.9.png
index 3429abf..3429abf 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_background.9.png
+++ b/res/drawable-mdpi/pickerbox_background.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_selected.9.png b/res/drawable-mdpi/pickerbox_selected.9.png
index d986a31..d986a31 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_selected.9.png
+++ b/res/drawable-mdpi/pickerbox_selected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_unselected.9.png b/res/drawable-mdpi/pickerbox_unselected.9.png
index 27ec6b9..27ec6b9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/pickerbox_unselected.9.png
+++ b/res/drawable-mdpi/pickerbox_unselected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_drag.9.png b/res/drawable-mdpi/playlist_tile_drag.9.png
index c90a6a4..c90a6a4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_drag.9.png
+++ b/res/drawable-mdpi/playlist_tile_drag.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_longpress.9.png b/res/drawable-mdpi/playlist_tile_longpress.9.png
index eabeb45..eabeb45 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_longpress.9.png
+++ b/res/drawable-mdpi/playlist_tile_longpress.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_normal.9.png b/res/drawable-mdpi/playlist_tile_normal.9.png
index fe11618..fe11618 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_normal.9.png
+++ b/res/drawable-mdpi/playlist_tile_normal.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_pressed.9.png b/res/drawable-mdpi/playlist_tile_pressed.9.png
index 9b57205..9b57205 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_pressed.9.png
+++ b/res/drawable-mdpi/playlist_tile_pressed.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_selected.9.png b/res/drawable-mdpi/playlist_tile_selected.9.png
index b1dbfb8..b1dbfb8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/playlist_tile_selected.9.png
+++ b/res/drawable-mdpi/playlist_tile_selected.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_bg_holo_dark.9.png b/res/drawable-mdpi/progress_bg_holo_dark.9.png
index 3d946e5..3d946e5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_bg_holo_dark.9.png
+++ b/res/drawable-mdpi/progress_bg_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_primary_holo_dark.9.png b/res/drawable-mdpi/progress_primary_holo_dark.9.png
index ab8ec69..ab8ec69 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_primary_holo_dark.9.png
+++ b/res/drawable-mdpi/progress_primary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_secondary_holo_dark.9.png b/res/drawable-mdpi/progress_secondary_holo_dark.9.png
index 7274274..7274274 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/progress_secondary_holo_dark.9.png
+++ b/res/drawable-mdpi/progress_secondary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/stat_notify_musicplayer.png b/res/drawable-mdpi/stat_notify_musicplayer.png
index c8c445d..c8c445d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/stat_notify_musicplayer.png
+++ b/res/drawable-mdpi/stat_notify_musicplayer.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/appwidget_bg.9.png b/res/drawable-xhdpi/appwidget_bg.9.png
index 7ccb762..7ccb762 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/appwidget_bg.9.png
+++ b/res/drawable-xhdpi/appwidget_bg.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/appwidget_divider.9.png b/res/drawable-xhdpi/appwidget_divider.9.png
index f7ad910..f7ad910 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/appwidget_divider.9.png
+++ b/res/drawable-xhdpi/appwidget_divider.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/btn_collapse_group_normal_holo_dark.png b/res/drawable-xhdpi/btn_collapse_group_normal_holo_dark.png
index baf75c1..baf75c1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/btn_collapse_group_normal_holo_dark.png
+++ b/res/drawable-xhdpi/btn_collapse_group_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png b/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
index f906e2a..f906e2a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_media_pause.png b/res/drawable-xhdpi/ic_media_pause.png
index f0844a8..f0844a8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_media_pause.png
+++ b/res/drawable-xhdpi/ic_media_pause.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png
index cf028c8..cf028c8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ b/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_bg_holo_dark.9.png b/res/drawable-xhdpi/progress_bg_holo_dark.9.png
index 345f5d3..345f5d3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_bg_holo_dark.9.png
+++ b/res/drawable-xhdpi/progress_bg_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_primary_holo_dark.9.png b/res/drawable-xhdpi/progress_primary_holo_dark.9.png
index c6c3f1e..c6c3f1e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_primary_holo_dark.9.png
+++ b/res/drawable-xhdpi/progress_primary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_secondary_holo_dark.9.png b/res/drawable-xhdpi/progress_secondary_holo_dark.9.png
index 205b66e..205b66e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/progress_secondary_holo_dark.9.png
+++ b/res/drawable-xhdpi/progress_secondary_holo_dark.9.png
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/bg_stripes_repeat.xml b/res/drawable/bg_stripes_repeat.xml
index 1d6f83d..af192e0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/bg_stripes_repeat.xml
+++ b/res/drawable/bg_stripes_repeat.xml
@@ -1,21 +1,21 @@
-<?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.

-

--->

-

-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

-    android:src="@drawable/bg_stripes"

-    android:tileMode="repeat" />

+<?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.
+
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/bg_stripes"
+    android:tileMode="repeat" />
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/btn_bg.xml b/res/drawable/btn_bg.xml
index 79d4078..79d4078 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/btn_bg.xml
+++ b/res/drawable/btn_bg.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/btn_bg_extra.xml b/res/drawable/btn_bg_extra.xml
index 94e7c82..94e7c82 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/btn_bg_extra.xml
+++ b/res/drawable/btn_bg_extra.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/buttonbarbackground.xml b/res/drawable/buttonbarbackground.xml
index 54f4181..54f4181 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/buttonbarbackground.xml
+++ b/res/drawable/buttonbarbackground.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/group_text_color.xml b/res/drawable/group_text_color.xml
index 6cc0130..1020e42 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/group_text_color.xml
+++ b/res/drawable/group_text_color.xml
@@ -1,6 +1,6 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">

-   <item android:state_focused="true" android:color="#ffffff"/>

-   <item android:state_pressed="true" android:state_enabled="false" android:color="#ffffff" />

-   <item android:state_enabled="false" android:color="#ffffff" />

-   <item android:color="#ff999999"/>

+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+   <item android:state_focused="true" android:color="#ffffff"/>
+   <item android:state_pressed="true" android:state_enabled="false" android:color="#ffffff" />
+   <item android:state_enabled="false" android:color="#ffffff" />
+   <item android:color="#ff999999"/>
  </selector>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index d8afcb6..d8afcb6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector_background.xml b/res/drawable/list_selector_background.xml
index 5389bc7..5389bc7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector_background.xml
+++ b/res/drawable/list_selector_background.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector_background_transition.xml b/res/drawable/list_selector_background_transition.xml
index d92b392..d92b392 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/list_selector_background_transition.xml
+++ b/res/drawable/list_selector_background_transition.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/now_playing_selector.xml b/res/drawable/now_playing_selector.xml
index 42512df..42df9bc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/now_playing_selector.xml
+++ b/res/drawable/now_playing_selector.xml
@@ -1,19 +1,19 @@
-<?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.

-

--->

-

-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">

-

-    <item android:drawable="@color/ics_opaque" android:state_pressed="true"/>

-    <item android:drawable="@color/ics_opaque" android:state_enabled="true" android:state_focused="true"/>

-    <item android:drawable="@drawable/now_playing_bg"/>

-

+<?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.
+
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:drawable="@color/ics_opaque" android:state_pressed="true"/>
+    <item android:drawable="@color/ics_opaque" android:state_enabled="true" android:state_focused="true"/>
+    <item android:drawable="@drawable/now_playing_bg"/>
+
 </selector>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/np_bg.xml b/res/drawable/np_bg.xml
index 0727e43..0727e43 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/np_bg.xml
+++ b/res/drawable/np_bg.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/player_background.xml b/res/drawable/player_background.xml
index 3c1c2a5..3c1c2a5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/player_background.xml
+++ b/res/drawable/player_background.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/playlist_tile.xml b/res/drawable/playlist_tile.xml
index 5e85f36..5e85f36 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/playlist_tile.xml
+++ b/res/drawable/playlist_tile.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/progress_horizontal.xml b/res/drawable/progress_horizontal.xml
index 9a0e078..9a0e078 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/progress_horizontal.xml
+++ b/res/drawable/progress_horizontal.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/seek_thumb.xml b/res/drawable/seek_thumb.xml
index d459f23..d459f23 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/seek_thumb.xml
+++ b/res/drawable/seek_thumb.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/status_bg.xml b/res/drawable/status_bg.xml
index 99e5ea6..c2cdf2f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/status_bg.xml
+++ b/res/drawable/status_bg.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

-    android:src="@drawable/notify_panel_notification_icon_bg"

-    android:tileMode="repeat" />

+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/notify_panel_notification_icon_bg"
+    android:tileMode="repeat" />
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/tabs_bg.xml b/res/drawable/tabs_bg.xml
index bd717fb..260370d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable/tabs_bg.xml
+++ b/res/drawable/tabs_bg.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>

-<selector xmlns:android="http://schemas.android.com/apk/res/android">

-

-    <item android:drawable="@drawable/btn_tab_blue" android:state_pressed="true"/>

-    <item android:drawable="@drawable/btn_tab_blue" android:state_enabled="true" android:state_focused="true"/>

-    <item android:drawable="@drawable/btn_tab_selected" android:state_selected="true"/>

-    <item android:drawable="@drawable/btn_tab_default"/>

-

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/btn_tab_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/btn_tab_blue" android:state_enabled="true" android:state_focused="true"/>
+    <item android:drawable="@drawable/btn_tab_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/btn_tab_default"/>
+
 </selector>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-keysexposed/create_playlist.xml b/res/layout-keysexposed/create_playlist.xml
index fbd3ae3..fbd3ae3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-keysexposed/create_playlist.xml
+++ b/res/layout-keysexposed/create_playlist.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-keyshidden/create_playlist.xml b/res/layout-keyshidden/create_playlist.xml
index 1ddf861..1ddf861 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-keyshidden/create_playlist.xml
+++ b/res/layout-keyshidden/create_playlist.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player.xml b/res/layout-land/audio_player.xml
index b5ce353..b5ce353 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player.xml
+++ b/res/layout-land/audio_player.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml b/res/layout-land/audio_player_common.xml
index 9d94cdc..9d94cdc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml
+++ b/res/layout-land/audio_player_common.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/buttonbar.xml b/res/layout-land/buttonbar.xml
index 1851fa7..1851fa7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/buttonbar.xml
+++ b/res/layout-land/buttonbar.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/extra_controls.xml b/res/layout-land/extra_controls.xml
index 9fce373..1ff6382 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/extra_controls.xml
+++ b/res/layout-land/extra_controls.xml
@@ -1,226 +1,226 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/extra_controls"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:layout_below="@id/album"

-    android:layout_gravity="fill_vertical"

-    android:background="@null"

-    android:visibility="gone"

-    android:weightSum="6.25" >

-

-    <LinearLayout

-        android:id="@+id/shuffle"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/shuffle_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false" />

-

-        <TextView

-            android:id="@+id/shuffle_text"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/shuffle_extra"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/repeat"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:longClickable="true"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/repeat_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false" />

-

-        <TextView

-            android:id="@+id/repeat_text"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/repeat_extra"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <!-- Landscape -->

-

-    <LinearLayout

-        android:id="@+id/shop"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_market" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/shop_min"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/ringtone"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_ring" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/set_ring"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/share_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:longClickable="true"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/share_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_share" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/share"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/eq_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/eq_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_eq" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/eq"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/delete_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_delete" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/delete_track"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/extra_controls"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_below="@id/album"
+    android:layout_gravity="fill_vertical"
+    android:background="@null"
+    android:visibility="gone"
+    android:weightSum="6.25" >
+
+    <LinearLayout
+        android:id="@+id/shuffle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/shuffle_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false" />
+
+        <TextView
+            android:id="@+id/shuffle_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/shuffle_extra"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/repeat"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:longClickable="true"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/repeat_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false" />
+
+        <TextView
+            android:id="@+id/repeat_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/repeat_extra"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <!-- Landscape -->
+
+    <LinearLayout
+        android:id="@+id/shop"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_market" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/shop_min"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ringtone"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_ring" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/set_ring"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/share_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:longClickable="true"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/share_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_share" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/share"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/eq_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/eq_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_eq" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/eq"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/delete_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_delete" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/delete_track"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml b/res/layout-land/media_picker_activity.xml
index 95e2c0b..95e2c0b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml
+++ b/res/layout-land/media_picker_activity.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml b/res/layout-land/media_picker_activity_expanding.xml
index 522d6c8..522d6c8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml
+++ b/res/layout-land/media_picker_activity_expanding.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/action_menu_layout.xml b/res/layout/action_menu_layout.xml
index 4de0ff3..4de0ff3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/action_menu_layout.xml
+++ b/res/layout/action_menu_layout.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget1x1.xml b/res/layout/album_appwidget1x1.xml
index a46105e..5ab05f1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget1x1.xml
+++ b/res/layout/album_appwidget1x1.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>

-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/content"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent" >

-

-    <ImageView

-        android:id="@+id/albumart"

-        android:layout_width="fill_parent"

-        android:layout_height="fill_parent"

-        android:adjustViewBounds="true" />

-

-    <ImageView

-        android:id="@+id/play_pause"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_gravity="center"

-        android:padding="6.0dip"

-        android:src="@drawable/appwidget_play_normal" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/albumart"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:adjustViewBounds="true" />
+
+    <ImageView
+        android:id="@+id/play_pause"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="6.0dip"
+        android:src="@drawable/appwidget_play_normal" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget3x1.xml b/res/layout/album_appwidget3x1.xml
index 55aea60..f9ffde0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget3x1.xml
+++ b/res/layout/album_appwidget3x1.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:layout_width="match_parent"

-    android:layout_height="match_parent"

-    android:background="@drawable/appwidget_bg"

-    android:orientation="horizontal" >

-

-    <ImageView

-        android:id="@+id/albumart"

-        android:layout_width="0dip"

-        android:layout_height="match_parent"

-        android:layout_weight="1.5"

-        android:adjustViewBounds="true"

-        android:scaleType="fitXY"

-        android:src="@drawable/appwidget_play_normal" />

-

-    <ImageView

-        android:id="@+id/previous"

-        android:layout_width="0dip"

-        android:layout_height="match_parent"

-        android:layout_weight="1.0"

-        android:background="@drawable/btn_bg"

-        android:scaleType="center"

-        android:src="@drawable/ic_appwidget_music_prev" />

-

-    <ImageView

-        android:id="@+id/next"

-        android:layout_width="0dip"

-        android:layout_height="match_parent"

-        android:layout_weight="1.0"

-        android:background="@drawable/btn_bg"

-        android:scaleType="center"

-        android:src="@drawable/ic_appwidget_music_next" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/appwidget_bg"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/albumart"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.5"
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/appwidget_play_normal" />
+
+    <ImageView
+        android:id="@+id/previous"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0"
+        android:background="@drawable/btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/ic_appwidget_music_prev" />
+
+    <ImageView
+        android:id="@+id/next"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0"
+        android:background="@drawable/btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/ic_appwidget_music_next" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x1.xml b/res/layout/album_appwidget4x1.xml
index f4676e5..f4676e5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x1.xml
+++ b/res/layout/album_appwidget4x1.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml b/res/layout/album_appwidget4x2.xml
index 8c138be..8c138be 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml
+++ b/res/layout/album_appwidget4x2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player.xml b/res/layout/audio_player.xml
index 1f39ef1..1f39ef1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player.xml
+++ b/res/layout/audio_player.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml b/res/layout/audio_player_common.xml
index 507d589..507d589 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml
+++ b/res/layout/audio_player_common.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audiopreview.xml b/res/layout/audiopreview.xml
index 7db8808..7db8808 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audiopreview.xml
+++ b/res/layout/audiopreview.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/buttonbar.xml b/res/layout/buttonbar.xml
index 001c598..001c598 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/buttonbar.xml
+++ b/res/layout/buttonbar.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/color_picker.xml b/res/layout/color_picker.xml
index 81f5176..81f5176 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/color_picker.xml
+++ b/res/layout/color_picker.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/confirm_delete.xml b/res/layout/confirm_delete.xml
index afc2e36..afc2e36 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/confirm_delete.xml
+++ b/res/layout/confirm_delete.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/do_not_show.xml b/res/layout/do_not_show.xml
index bd7d6ef..bea5ef9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/do_not_show.xml
+++ b/res/layout/do_not_show.xml
@@ -1,15 +1,15 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/do_not_show"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:orientation="horizontal"

-    android:padding="10dp" >

-

-    <CheckBox

-        android:id="@+id/noShow"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:text="Do not show again" >

-    </CheckBox>

-

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/do_not_show"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+
+    <CheckBox
+        android:id="@+id/noShow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Do not show again" >
+    </CheckBox>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/edit_track_list_item.xml b/res/layout/edit_track_list_item.xml
index e8307bb..e8307bb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/edit_track_list_item.xml
+++ b/res/layout/edit_track_list_item.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml b/res/layout/extra_controls.xml
index 4f85fdb..574a950 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml
+++ b/res/layout/extra_controls.xml
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/extra_controls"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:layout_below="@id/album"

-    android:layout_gravity="fill_vertical"

-    android:visibility="gone"

-    android:weightSum="5.0" >

-

-    <LinearLayout

-        android:id="@+id/shuffle"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/shuffle_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false" />

-

-        <TextView

-            android:id="@+id/shuffle_text"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/shuffle_extra"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/repeat"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:longClickable="true"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/repeat_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false" />

-

-        <TextView

-            android:id="@+id/repeat_text"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/repeat_extra"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <!-- Landscape -->

-

-    <LinearLayout

-        android:id="@+id/shop"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:id="@+id/shop_button"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_market" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/shop_min"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/ringtone"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:id="@+id/ring_button"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_ring" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/set_ring"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/share_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:longClickable="true"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/share_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_share" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/share"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/eq_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical" >

-

-        <ImageButton

-            android:id="@+id/eq_extra_image"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_eq" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/eq"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

-    <LinearLayout

-        android:id="@+id/delete_extra"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_weight="1.25"

-        android:background="@drawable/btn_bg_extra"

-        android:clickable="true"

-        android:gravity="center"

-        android:orientation="vertical"

-        android:visibility="gone" >

-

-        <ImageButton

-            android:id="@+id/delete_button"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:background="@null"

-            android:clickable="false"

-            android:src="@drawable/ic_menu_delete" />

-

-        <TextView

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_marginTop="2.0dip"

-            android:gravity="center_horizontal"

-            android:shadowColor="#ff111111"

-            android:text="@string/delete_track"

-            android:textColor="#ffffffff"

-            android:textSize="12.0dip"

-            android:textStyle="bold" />

-    </LinearLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/extra_controls"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_below="@id/album"
+    android:layout_gravity="fill_vertical"
+    android:visibility="gone"
+    android:weightSum="5.0" >
+
+    <LinearLayout
+        android:id="@+id/shuffle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/shuffle_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false" />
+
+        <TextView
+            android:id="@+id/shuffle_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/shuffle_extra"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/repeat"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:longClickable="true"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/repeat_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false" />
+
+        <TextView
+            android:id="@+id/repeat_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/repeat_extra"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <!-- Landscape -->
+
+    <LinearLayout
+        android:id="@+id/shop"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:id="@+id/shop_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_market" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/shop_min"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ringtone"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:id="@+id/ring_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_ring" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/set_ring"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/share_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:longClickable="true"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/share_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_share" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/share"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/eq_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageButton
+            android:id="@+id/eq_extra_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_eq" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/eq"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/delete_extra"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.25"
+        android:background="@drawable/btn_bg_extra"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ImageButton
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:src="@drawable/ic_menu_delete" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2.0dip"
+            android:gravity="center_horizontal"
+            android:shadowColor="#ff111111"
+            android:text="@string/delete_track"
+            android:textColor="#ffffffff"
+            android:textSize="12.0dip"
+            android:textStyle="bold" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml b/res/layout/media_picker_activity.xml
index 823375f..823375f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml
+++ b/res/layout/media_picker_activity.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml b/res/layout/media_picker_activity_expanding.xml
index c9c2786..c9c2786 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml
+++ b/res/layout/media_picker_activity_expanding.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/music_picker.xml b/res/layout/music_picker.xml
index 8b23b00..8b23b00 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/music_picker.xml
+++ b/res/layout/music_picker.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/music_picker_item.xml b/res/layout/music_picker_item.xml
index 0d0ae21..0d0ae21 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/music_picker_item.xml
+++ b/res/layout/music_picker_item.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml b/res/layout/nowplaying.xml
index 54754e2..762a5fa 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml
+++ b/res/layout/nowplaying.xml
@@ -1,158 +1,158 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/nowplaying"

-    android:layout_width="fill_parent"

-    android:layout_height="54.0dip"

-    android:background="@drawable/np_bg"

-    android:focusable="true"

-    android:orientation="vertical" >

-

-    <ImageView

-        android:id="@+id/info_divider"

-        android:layout_width="match_parent"

-        android:layout_height="1dip"

-        android:background="@color/ics"

-        android:scaleType="fitXY" />

-

-    <ProgressBar

-        android:id="@+id/progress"

-        style="?android:attr/progressBarStyleHorizontal"

-        android:layout_width="match_parent"

-        android:layout_height="5dip"

-        android:progressDrawable="@drawable/progress_horizontal"

-        android:visibility="gone" />

-

-    <LinearLayout

-        android:layout_width="fill_parent"

-        android:layout_height="fill_parent"

-        android:orientation="horizontal" >

-

-        <ImageView

-            android:id="@+id/now_playing_albumart"

-            android:layout_width="54.0dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="left|center"

-            android:adjustViewBounds="true"

-            android:scaleType="fitXY" />

-

-        <LinearLayout

-            android:layout_width="0.0dip"

-            android:layout_height="wrap_content"

-            android:layout_gravity="center_vertical"

-            android:layout_weight="1.0"

-            android:orientation="vertical" >

-

-            <TextView

-                android:id="@+id/now_playing_title"

-                android:layout_width="fill_parent"

-                android:layout_height="wrap_content"

-                android:layout_marginLeft="7.0dip"

-                android:ellipsize="end"

-                android:singleLine="true"

-                android:textAppearance="?android:textAppearanceSmall"

-                android:textColor="#dadada"

-                android:textSize="10.0sp"

-                android:textStyle="bold" />

-

-            <TextView

-                android:id="@+id/now_playing_artist"

-                android:layout_width="fill_parent"

-                android:layout_height="wrap_content"

-                android:layout_marginLeft="7.0dip"

-                android:ellipsize="end"

-                android:singleLine="true"

-                android:textAppearance="?android:textAppearanceSmall"

-                android:textColor="#ff999999"

-                android:textSize="9.0sp" />

-

-            <TextView

-                android:id="@+id/now_playing_albumname"

-                android:layout_width="fill_parent"

-                android:layout_height="wrap_content"

-                android:layout_marginLeft="7.0dip"

-                android:ellipsize="end"

-                android:singleLine="true"

-                android:textAppearance="?android:textAppearanceSmall"

-                android:textColor="#ff999999"

-                android:textSize="9.0sp" />

-        </LinearLayout>

-

-        <ImageView

-            android:id="@id/icon"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_gravity="center_vertical"

-            android:layout_marginLeft="16.0dip" />

-

-        <ImageButton

-            android:id="@+id/media_prev"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_appwidget_music_prev"

-            android:visibility="gone" />

-

-        <ImageButton

-            android:id="@+id/media_play"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_appwidget_music_play"

-            android:visibility="gone" />

-

-        <ImageButton

-            android:id="@+id/media_next"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_appwidget_music_next"

-            android:visibility="gone" />

-

-        <ImageButton

-            android:id="@+id/plus_playlist"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_menu_add_playlist" />

-

-        <ImageButton

-            android:id="@+id/share_song"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_menu_share"

-            android:visibility="gone" />

-

-        <ImageButton

-            android:id="@+id/market_music"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_market"

-            android:visibility="gone" />

-

-        <ImageButton

-            android:id="@+id/doSearch"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_ab_search_holo_dark" />

-

-        <ImageButton

-            android:id="@+id/overFlow"

-            android:layout_width="56dip"

-            android:layout_height="match_parent"

-            android:layout_gravity="center|right"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"

-            android:visibility="gone" />

-    </LinearLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/nowplaying"
+    android:layout_width="fill_parent"
+    android:layout_height="54.0dip"
+    android:background="@drawable/np_bg"
+    android:focusable="true"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/info_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="@color/ics"
+        android:scaleType="fitXY" />
+
+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dip"
+        android:progressDrawable="@drawable/progress_horizontal"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/now_playing_albumart"
+            android:layout_width="54.0dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="left|center"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
+
+        <LinearLayout
+            android:layout_width="0.0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/now_playing_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="7.0dip"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="#dadada"
+                android:textSize="10.0sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/now_playing_artist"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="7.0dip"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="#ff999999"
+                android:textSize="9.0sp" />
+
+            <TextView
+                android:id="@+id/now_playing_albumname"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="7.0dip"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="#ff999999"
+                android:textSize="9.0sp" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="16.0dip" />
+
+        <ImageButton
+            android:id="@+id/media_prev"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_appwidget_music_prev"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/media_play"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_appwidget_music_play"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/media_next"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_appwidget_music_next"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/plus_playlist"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_menu_add_playlist" />
+
+        <ImageButton
+            android:id="@+id/share_song"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_menu_share"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/market_music"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_market"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/doSearch"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_ab_search_holo_dark" />
+
+        <ImageButton
+            android:id="@+id/overFlow"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|right"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"
+            android:visibility="gone" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/player.xml b/res/layout/player.xml
index 77396fc..77396fc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/player.xml
+++ b/res/layout/player.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/query_activity.xml b/res/layout/query_activity.xml
index 7575364..7575364 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/query_activity.xml
+++ b/res/layout/query_activity.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/scanning.xml b/res/layout/scanning.xml
index c4aa9ad..c4aa9ad 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/scanning.xml
+++ b/res/layout/scanning.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/scanning_nosdcard.xml b/res/layout/scanning_nosdcard.xml
index bb09fb8..bb09fb8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/scanning_nosdcard.xml
+++ b/res/layout/scanning_nosdcard.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/sd_error.xml b/res/layout/sd_error.xml
index 8a40305..8a40305 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/sd_error.xml
+++ b/res/layout/sd_error.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/sensitive.xml b/res/layout/sensitive.xml
index 7ee786d..7ee786d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/sensitive.xml
+++ b/res/layout/sensitive.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/statusbar.xml b/res/layout/statusbar.xml
index f53bf2a..ce1a2cd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/statusbar.xml
+++ b/res/layout/statusbar.xml
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/statusbar"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:orientation="vertical" >

-

-    <LinearLayout

-        xmlns:android="http://schemas.android.com/apk/res/android"

-        android:layout_width="fill_parent"

-        android:layout_height="fill_parent"

-        android:orientation="horizontal" >

-

-        <ImageView

-            android:id="@+id/icon"

-            android:layout_width="64.0dip"

-            android:layout_height="64.0dip"

-            android:layout_weight="0.0"

-            android:gravity="center" />

-

-        <ImageView

-            android:id="@+id/status_icon"

-            android:layout_width="64.0dip"

-            android:layout_height="64.0dip"

-            android:background="@drawable/status_bg"

-            android:scaleType="center"

-            android:visibility="gone" />

-

-        <LinearLayout

-            android:layout_width="0.0dp"

-            android:layout_height="wrap_content"

-            android:layout_gravity="center_vertical"

-            android:layout_weight="1.0"

-            android:orientation="vertical"

-            android:paddingLeft="11.0dip" >

-

-            <TextView

-                android:id="@+id/trackname"

-                style="@android:style/TextAppearance.StatusBar.EventContent.Title"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_gravity="left"

-                android:ellipsize="marquee"

-                android:focusable="true"

-                android:singleLine="true" />

-

-            <TextView

-                android:id="@+id/artist"

-                style="@android:style/TextAppearance.StatusBar.EventContent"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_gravity="left"

-                android:ellipsize="end"

-                android:scrollHorizontally="true"

-                android:singleLine="true" />

-

-            <TextView

-                android:id="@+id/album"

-                style="@android:style/TextAppearance.StatusBar.EventContent"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_gravity="left"

-                android:ellipsize="end"

-                android:scrollHorizontally="true"

-                android:singleLine="true" />

-        </LinearLayout>

-

-        <ImageButton

-            android:id="@+id/status_media_prev"

-            android:layout_width="40dip"

-            android:layout_height="40dip"

-            android:layout_gravity="center|right"

-            android:layout_marginRight="5dip"

-            android:layout_marginTop="2dip"

-            android:layout_weight="0.0"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/status_prev" />

-

-        <ImageButton

-            android:id="@+id/status_media_play"

-            android:layout_width="40dip"

-            android:layout_height="40dip"

-            android:layout_gravity="center|right"

-            android:layout_marginRight="5dip"

-            android:layout_marginTop="2dip"

-            android:layout_weight="0.0"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/status_play" />

-

-        <ImageButton

-            android:id="@+id/status_media_next"

-            android:layout_width="40dip"

-            android:layout_height="40dip"

-            android:layout_gravity="center|right"

-            android:layout_marginRight="5dip"

-            android:layout_marginTop="2dip"

-            android:layout_weight="0.0"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/status_next" />

-

-        <ImageButton

-            android:id="@+id/status_media_collapse"

-            android:layout_width="40dip"

-            android:layout_height="40dip"

-            android:layout_gravity="center|right"

-            android:layout_marginRight="5dip"

-            android:layout_marginTop="2dip"

-            android:layout_weight="0.0"

-            android:background="@drawable/btn_bg"

-            android:src="@drawable/btn_collapse_group_normal_holo_dark" />

-    </LinearLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:layout_weight="0.0"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/status_icon"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:background="@drawable/status_bg"
+            android:scaleType="center"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:layout_width="0.0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:paddingLeft="11.0dip" >
+
+            <TextView
+                android:id="@+id/trackname"
+                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/artist"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/album"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/status_media_prev"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_prev" />
+
+        <ImageButton
+            android:id="@+id/status_media_play"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_play" />
+
+        <ImageButton
+            android:id="@+id/status_media_next"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_next" />
+
+        <ImageButton
+            android:id="@+id/status_media_collapse"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/btn_collapse_group_normal_holo_dark" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/theme_preview.xml b/res/layout/theme_preview.xml
index 5a85225..5a85225 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/theme_preview.xml
+++ b/res/layout/theme_preview.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item.xml b/res/layout/track_list_item.xml
index 9b1d703..9b1d703 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item.xml
+++ b/res/layout/track_list_item.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml b/res/layout/track_list_item_child.xml
index 4a2d35d..4a2d35d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml
+++ b/res/layout/track_list_item_child.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_common.xml b/res/layout/track_list_item_common.xml
index 6b9c959..0bfea3d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_common.xml
+++ b/res/layout/track_list_item_common.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>

-<merge xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <ImageView

-        android:id="@+id/icon"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignParentBottom="true"

-        android:layout_alignParentLeft="true"

-        android:layout_alignParentTop="true" />

-

-    <TextView

-        android:id="@+id/duration"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignBaseline="@id/line1"

-        android:layout_alignParentRight="true"

-        android:paddingLeft="4.0dip"

-        android:paddingRight="11.0dip"

-        android:singleLine="true"

-        android:textColor="#ff999999"

-        android:textSize="12.0sp"

-        android:textStyle="bold" />

-

-    <TextView

-        android:id="@+id/line1"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignWithParentIfMissing="true"

-        android:layout_toLeftOf="@id/duration"

-        android:layout_toRightOf="@id/icon"

-        android:ellipsize="marquee"

-        android:paddingLeft="9.0dip"

-        android:paddingTop="9.0dip"

-        android:shadowColor="#ff000000"

-        android:shadowDx="0"

-        android:shadowDy="0"

-        android:shadowRadius="3"

-        android:singleLine="true"

-        android:textAppearance="?android:textAppearanceSmall"

-        android:textColor="#dadada" />

-

-    <TextView

-        android:id="@+id/line2"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignWithParentIfMissing="true"

-        android:layout_below="@id/line1"

-        android:layout_toLeftOf="@id/duration"

-        android:layout_toRightOf="@id/icon"

-        android:ellipsize="end"

-        android:paddingLeft="9.0dip"

-        android:paddingTop="9.0dip"

-        android:scrollHorizontally="true"

-        android:shadowColor="#ff000000"

-        android:shadowDx="0"

-        android:shadowDy="0"

-        android:shadowRadius="3"

-        android:singleLine="true"

-        android:textAppearance="?android:textAppearanceSmall"

-        android:textColor="#ff999999"

-        android:visibility="visible" />

-

-    <ImageView

-        android:id="@+id/play_indicator"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignParentRight="true"

-        android:layout_alignParentTop="true"

-        android:layout_below="@id/duration"

-        android:layout_marginRight="42.0dip"

-        android:layout_marginTop="18.0dip" />

-

-    <FrameLayout

-        android:id="@+id/second_column_icon"

-        android:layout_width="wrap_content"

-        android:layout_height="fill_parent"

-        android:layout_alignParentRight="true"

-        android:background="@drawable/btn_bg"

-        android:clickable="true"

-        android:paddingRight="4.0dip" >

-

-        <ImageView

-            android:id="@+id/CM"

-            android:layout_width="wrap_content"

-            android:layout_height="fill_parent"

-            android:layout_gravity="center"

-            android:layout_marginRight="5.0dip"

-            android:scaleType="centerInside"

-            android:src="@drawable/btn_context_menu" />

-    </FrameLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" />
+
+    <TextView
+        android:id="@+id/duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/line1"
+        android:layout_alignParentRight="true"
+        android:paddingLeft="4.0dip"
+        android:paddingRight="11.0dip"
+        android:singleLine="true"
+        android:textColor="#ff999999"
+        android:textSize="12.0sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_toLeftOf="@id/duration"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="marquee"
+        android:paddingLeft="9.0dip"
+        android:paddingTop="9.0dip"
+        android:shadowColor="#ff000000"
+        android:shadowDx="0"
+        android:shadowDy="0"
+        android:shadowRadius="3"
+        android:singleLine="true"
+        android:textAppearance="?android:textAppearanceSmall"
+        android:textColor="#dadada" />
+
+    <TextView
+        android:id="@+id/line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_below="@id/line1"
+        android:layout_toLeftOf="@id/duration"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="end"
+        android:paddingLeft="9.0dip"
+        android:paddingTop="9.0dip"
+        android:scrollHorizontally="true"
+        android:shadowColor="#ff000000"
+        android:shadowDx="0"
+        android:shadowDy="0"
+        android:shadowRadius="3"
+        android:singleLine="true"
+        android:textAppearance="?android:textAppearanceSmall"
+        android:textColor="#ff999999"
+        android:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/play_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_below="@id/duration"
+        android:layout_marginRight="42.0dip"
+        android:layout_marginTop="18.0dip" />
+
+    <FrameLayout
+        android:id="@+id/second_column_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/btn_bg"
+        android:clickable="true"
+        android:paddingRight="4.0dip" >
+
+        <ImageView
+            android:id="@+id/CM"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center"
+            android:layout_marginRight="5.0dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/btn_context_menu" />
+    </FrameLayout>
+
 </merge>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_common_child.xml b/res/layout/track_list_item_common_child.xml
index ec81ee3..711578a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_common_child.xml
+++ b/res/layout/track_list_item_common_child.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>

-<merge xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <ImageView

-        android:id="@+id/icon"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignParentBottom="true"

-        android:layout_alignParentLeft="true"

-        android:layout_alignParentTop="true" />

-

-    <TextView

-        android:id="@+id/duration"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignBaseline="@id/line1"

-        android:layout_alignParentRight="true"

-        android:paddingLeft="4.0dip"

-        android:paddingRight="11.0dip"

-        android:singleLine="true"

-        android:textColor="#ff999999"

-        android:textSize="12.0sp"

-        android:textStyle="bold" />

-

-    <TextView

-        android:id="@+id/line1"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignWithParentIfMissing="true"

-        android:layout_toLeftOf="@id/duration"

-        android:layout_toRightOf="@id/icon"

-        android:ellipsize="marquee"

-        android:paddingLeft="9.0dip"

-        android:paddingTop="9.0dip"

-        android:singleLine="true"

-        android:textAppearance="?android:textAppearanceSmall"

-        android:textColor="#ff171717" />

-

-    <TextView

-        android:id="@+id/line2"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignWithParentIfMissing="true"

-        android:layout_below="@id/line1"

-        android:layout_toLeftOf="@id/duration"

-        android:layout_toRightOf="@id/icon"

-        android:ellipsize="end"

-        android:paddingLeft="9.0dip"

-        android:paddingTop="9.0dip"

-        android:scrollHorizontally="true"

-        android:singleLine="true"

-        android:textAppearance="?android:textAppearanceSmall"

-        android:textColor="#801f1f1f"

-        android:visibility="visible" />

-

-    <ImageView

-        android:id="@+id/play_indicator"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignParentRight="true"

-        android:layout_alignParentTop="true"

-        android:layout_below="@id/duration"

-        android:layout_marginRight="42.0dip"

-        android:layout_marginTop="18.0dip" />

-

-    <FrameLayout

-        android:id="@+id/second_column_icon"

-        android:layout_width="wrap_content"

-        android:layout_height="fill_parent"

-        android:layout_alignParentRight="true"

-        android:background="@drawable/btn_bg"

-        android:clickable="true"

-        android:paddingRight="4.0dip" >

-

-        <ImageView

-            android:id="@+id/CM"

-            android:layout_width="wrap_content"

-            android:layout_height="fill_parent"

-            android:layout_gravity="center"

-            android:layout_marginRight="5.0dip"

-            android:scaleType="centerInside"

-            android:src="@drawable/btn_context_menu_child" />

-    </FrameLayout>

-

+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" />
+
+    <TextView
+        android:id="@+id/duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/line1"
+        android:layout_alignParentRight="true"
+        android:paddingLeft="4.0dip"
+        android:paddingRight="11.0dip"
+        android:singleLine="true"
+        android:textColor="#ff999999"
+        android:textSize="12.0sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_toLeftOf="@id/duration"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="marquee"
+        android:paddingLeft="9.0dip"
+        android:paddingTop="9.0dip"
+        android:singleLine="true"
+        android:textAppearance="?android:textAppearanceSmall"
+        android:textColor="#ff171717" />
+
+    <TextView
+        android:id="@+id/line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_below="@id/line1"
+        android:layout_toLeftOf="@id/duration"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="end"
+        android:paddingLeft="9.0dip"
+        android:paddingTop="9.0dip"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="?android:textAppearanceSmall"
+        android:textColor="#801f1f1f"
+        android:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/play_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_below="@id/duration"
+        android:layout_marginRight="42.0dip"
+        android:layout_marginTop="18.0dip" />
+
+    <FrameLayout
+        android:id="@+id/second_column_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/btn_bg"
+        android:clickable="true"
+        android:paddingRight="4.0dip" >
+
+        <ImageView
+            android:id="@+id/CM"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center"
+            android:layout_marginRight="5.0dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/btn_context_menu_child" />
+    </FrameLayout>
+
 </merge>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml b/res/layout/track_list_item_group.xml
index f80be87..f80be87 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml
+++ b/res/layout/track_list_item_group.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/weekpicker.xml b/res/layout/weekpicker.xml
index 3b67c2e..3b67c2e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/weekpicker.xml
+++ b/res/layout/weekpicker.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/menu/action_menu.xml b/res/menu/action_menu.xml
index 5aaa60d..39d46d4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/menu/action_menu.xml
+++ b/res/menu/action_menu.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <item

-        android:id="@+id/delete"

-        android:icon="@drawable/ic_menu_delete"

-        android:showAsAction="always|withText"

-        android:title="@string/delete_item"/>

-    <item

-        android:id="@+id/add"

-        android:icon="@drawable/ic_menu_add"

-        android:showAsAction="always|withText"

-        android:title="@string/add_to_playlist"/>

-

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_menu_delete"
+        android:showAsAction="always|withText"
+        android:title="@string/delete_item"/>
+    <item
+        android:id="@+id/add"
+        android:icon="@drawable/ic_menu_add"
+        android:showAsAction="always|withText"
+        android:title="@string/add_to_playlist"/>
+
 </menu>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/raw/gestures b/res/raw/gestures
index 6112c6d..6112c6d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/raw/gestures
+++ b/res/raw/gestures
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af-keysexposed/strings.xml b/res/values-af-keysexposed/strings.xml
index 465a99f..465a99f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af-keysexposed/strings.xml
+++ b/res/values-af-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af-keyshidden/strings.xml b/res/values-af-keyshidden/strings.xml
index 759a0c2..759a0c2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af-keyshidden/strings.xml
+++ b/res/values-af-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af/strings.xml b/res/values-af/strings.xml
index 46d0154..46d0154 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af/strings2.xml b/res/values-af/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-af/strings2.xml
+++ b/res/values-af/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am-keysexposed/strings.xml b/res/values-am-keysexposed/strings.xml
index e980695..e980695 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am-keysexposed/strings.xml
+++ b/res/values-am-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am-keyshidden/strings.xml b/res/values-am-keyshidden/strings.xml
index 1b991bd..1b991bd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am-keyshidden/strings.xml
+++ b/res/values-am-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am/strings.xml b/res/values-am/strings.xml
index 4d79bc1..4d79bc1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am/strings2.xml b/res/values-am/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-am/strings2.xml
+++ b/res/values-am/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar-keysexposed/strings.xml b/res/values-ar-keysexposed/strings.xml
index 46c73ea..46c73ea 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar-keysexposed/strings.xml
+++ b/res/values-ar-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar-keyshidden/strings.xml b/res/values-ar-keyshidden/strings.xml
index d39c6ea..d39c6ea 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar-keyshidden/strings.xml
+++ b/res/values-ar-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0191e95..0191e95 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar/strings2.xml b/res/values-ar/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ar/strings2.xml
+++ b/res/values-ar/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be-keysexposed/strings.xml b/res/values-be-keysexposed/strings.xml
index 17a1e33..17a1e33 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be-keysexposed/strings.xml
+++ b/res/values-be-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be-keyshidden/strings.xml b/res/values-be-keyshidden/strings.xml
index ec2dc7e..ec2dc7e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be-keyshidden/strings.xml
+++ b/res/values-be-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be/strings.xml b/res/values-be/strings.xml
index 1bf8683..1bf8683 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be/strings2.xml b/res/values-be/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-be/strings2.xml
+++ b/res/values-be/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg-keysexposed/strings.xml b/res/values-bg-keysexposed/strings.xml
index 5f1794d..5f1794d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg-keysexposed/strings.xml
+++ b/res/values-bg-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg-keyshidden/strings.xml b/res/values-bg-keyshidden/strings.xml
index d53b9b0..d53b9b0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg-keyshidden/strings.xml
+++ b/res/values-bg-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7332b26..7332b26 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg/strings2.xml b/res/values-bg/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-bg/strings2.xml
+++ b/res/values-bg/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca-keysexposed/strings.xml b/res/values-ca-keysexposed/strings.xml
index 0f97e60..0f97e60 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca-keysexposed/strings.xml
+++ b/res/values-ca-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca-keyshidden/strings.xml b/res/values-ca-keyshidden/strings.xml
index eb84dfb..eb84dfb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca-keyshidden/strings.xml
+++ b/res/values-ca-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9eed344..9eed344 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca/strings2.xml b/res/values-ca/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ca/strings2.xml
+++ b/res/values-ca/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs-keysexposed/strings.xml b/res/values-cs-keysexposed/strings.xml
index 4e7d998..4e7d998 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs-keysexposed/strings.xml
+++ b/res/values-cs-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs-keyshidden/strings.xml b/res/values-cs-keyshidden/strings.xml
index 3b7bf0e..3b7bf0e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs-keyshidden/strings.xml
+++ b/res/values-cs-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c60765d..c60765d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs/strings2.xml b/res/values-cs/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-cs/strings2.xml
+++ b/res/values-cs/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da-keysexposed/strings.xml b/res/values-da-keysexposed/strings.xml
index ccaaa07..ccaaa07 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da-keysexposed/strings.xml
+++ b/res/values-da-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da-keyshidden/strings.xml b/res/values-da-keyshidden/strings.xml
index 5c3bba0..5c3bba0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da-keyshidden/strings.xml
+++ b/res/values-da-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da/strings.xml b/res/values-da/strings.xml
index 359c0ac..359c0ac 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da/strings2.xml b/res/values-da/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-da/strings2.xml
+++ b/res/values-da/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de-keysexposed/strings.xml b/res/values-de-keysexposed/strings.xml
index 4d2394c..4d2394c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de-keysexposed/strings.xml
+++ b/res/values-de-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de-keyshidden/strings.xml b/res/values-de-keyshidden/strings.xml
index c4e86b2..c4e86b2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de-keyshidden/strings.xml
+++ b/res/values-de-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de/strings.xml b/res/values-de/strings.xml
index 715526f..715526f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de/strings2.xml b/res/values-de/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-de/strings2.xml
+++ b/res/values-de/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el-keysexposed/strings.xml b/res/values-el-keysexposed/strings.xml
index cf1b921..cf1b921 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el-keysexposed/strings.xml
+++ b/res/values-el-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el-keyshidden/strings.xml b/res/values-el-keyshidden/strings.xml
index f6ae4d3..f6ae4d3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el-keyshidden/strings.xml
+++ b/res/values-el-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el/strings.xml b/res/values-el/strings.xml
index cbc6e76..cbc6e76 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el/strings2.xml b/res/values-el/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-el/strings2.xml
+++ b/res/values-el/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB-keysexposed/strings.xml b/res/values-en-rGB-keysexposed/strings.xml
index 914b59f..914b59f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB-keysexposed/strings.xml
+++ b/res/values-en-rGB-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB-keyshidden/strings.xml b/res/values-en-rGB-keyshidden/strings.xml
index 46a835a..46a835a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB-keyshidden/strings.xml
+++ b/res/values-en-rGB-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e0549d7..e0549d7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB/strings2.xml b/res/values-en-rGB/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-en-rGB/strings2.xml
+++ b/res/values-en-rGB/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-keysexposed/strings.xml b/res/values-es-keysexposed/strings.xml
index 03893aa..03893aa 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-keysexposed/strings.xml
+++ b/res/values-es-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-keyshidden/strings.xml b/res/values-es-keyshidden/strings.xml
index f772c8b..f772c8b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-keyshidden/strings.xml
+++ b/res/values-es-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS-keysexposed/strings.xml b/res/values-es-rUS-keysexposed/strings.xml
index f25ad37..f25ad37 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS-keysexposed/strings.xml
+++ b/res/values-es-rUS-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS-keyshidden/strings.xml b/res/values-es-rUS-keyshidden/strings.xml
index fc17017..fc17017 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS-keyshidden/strings.xml
+++ b/res/values-es-rUS-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 365072e..365072e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS/strings2.xml b/res/values-es-rUS/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es-rUS/strings2.xml
+++ b/res/values-es-rUS/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es/strings.xml b/res/values-es/strings.xml
index 0c36c8a..0c36c8a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es/strings2.xml b/res/values-es/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-es/strings2.xml
+++ b/res/values-es/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et-keysexposed/strings.xml b/res/values-et-keysexposed/strings.xml
index 2217dd7..2217dd7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et-keysexposed/strings.xml
+++ b/res/values-et-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et-keyshidden/strings.xml b/res/values-et-keyshidden/strings.xml
index eb57c5d..eb57c5d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et-keyshidden/strings.xml
+++ b/res/values-et-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et/strings.xml b/res/values-et/strings.xml
index 75dc453..75dc453 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et/strings2.xml b/res/values-et/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-et/strings2.xml
+++ b/res/values-et/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa-keysexposed/strings.xml b/res/values-fa-keysexposed/strings.xml
index 1ed0132..1ed0132 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa-keysexposed/strings.xml
+++ b/res/values-fa-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa-keyshidden/strings.xml b/res/values-fa-keyshidden/strings.xml
index cfec27c..cfec27c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa-keyshidden/strings.xml
+++ b/res/values-fa-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dc8b65d..dc8b65d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa/strings2.xml b/res/values-fa/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fa/strings2.xml
+++ b/res/values-fa/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi-keysexposed/strings.xml b/res/values-fi-keysexposed/strings.xml
index a2b4eb8..a2b4eb8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi-keysexposed/strings.xml
+++ b/res/values-fi-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi-keyshidden/strings.xml b/res/values-fi-keyshidden/strings.xml
index 6b238cd..6b238cd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi-keyshidden/strings.xml
+++ b/res/values-fi-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7b5f3b1..7b5f3b1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi/strings2.xml b/res/values-fi/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fi/strings2.xml
+++ b/res/values-fi/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr-keysexposed/strings.xml b/res/values-fr-keysexposed/strings.xml
index f7a0667..f7a0667 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr-keysexposed/strings.xml
+++ b/res/values-fr-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr-keyshidden/strings.xml b/res/values-fr-keyshidden/strings.xml
index a2b29e6..a2b29e6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr-keyshidden/strings.xml
+++ b/res/values-fr-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e3eb413..e3eb413 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr/strings2.xml b/res/values-fr/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-fr/strings2.xml
+++ b/res/values-fr/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi-keysexposed/strings.xml b/res/values-hi-keysexposed/strings.xml
index 9aa4858..9aa4858 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi-keysexposed/strings.xml
+++ b/res/values-hi-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi-keyshidden/strings.xml b/res/values-hi-keyshidden/strings.xml
index 543b984..543b984 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi-keyshidden/strings.xml
+++ b/res/values-hi-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ac7a326..ac7a326 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi/strings2.xml b/res/values-hi/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hi/strings2.xml
+++ b/res/values-hi/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr-keysexposed/strings.xml b/res/values-hr-keysexposed/strings.xml
index 385676c..385676c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr-keysexposed/strings.xml
+++ b/res/values-hr-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr-keyshidden/strings.xml b/res/values-hr-keyshidden/strings.xml
index 9842ce5..9842ce5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr-keyshidden/strings.xml
+++ b/res/values-hr-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b3667f3..b3667f3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr/strings2.xml b/res/values-hr/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hr/strings2.xml
+++ b/res/values-hr/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu-keysexposed/strings.xml b/res/values-hu-keysexposed/strings.xml
index e9d0218..e9d0218 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu-keysexposed/strings.xml
+++ b/res/values-hu-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu-keyshidden/strings.xml b/res/values-hu-keyshidden/strings.xml
index 3682fa9..3682fa9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu-keyshidden/strings.xml
+++ b/res/values-hu-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c38ef12..c38ef12 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu/strings2.xml b/res/values-hu/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-hu/strings2.xml
+++ b/res/values-hu/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in-keysexposed/strings.xml b/res/values-in-keysexposed/strings.xml
index 293566f..293566f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in-keysexposed/strings.xml
+++ b/res/values-in-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in-keyshidden/strings.xml b/res/values-in-keyshidden/strings.xml
index 7a3a5c4..7a3a5c4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in-keyshidden/strings.xml
+++ b/res/values-in-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in/strings.xml b/res/values-in/strings.xml
index 3d1e003..3d1e003 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in/strings2.xml b/res/values-in/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-in/strings2.xml
+++ b/res/values-in/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it-keysexposed/strings.xml b/res/values-it-keysexposed/strings.xml
index af035b2..af035b2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it-keysexposed/strings.xml
+++ b/res/values-it-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it-keyshidden/strings.xml b/res/values-it-keyshidden/strings.xml
index 30333c2..30333c2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it-keyshidden/strings.xml
+++ b/res/values-it-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it/strings.xml b/res/values-it/strings.xml
index 2eaed67..2eaed67 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it/strings2.xml b/res/values-it/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-it/strings2.xml
+++ b/res/values-it/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw-keysexposed/strings.xml b/res/values-iw-keysexposed/strings.xml
index b9dfd7c..b9dfd7c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw-keysexposed/strings.xml
+++ b/res/values-iw-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw-keyshidden/strings.xml b/res/values-iw-keyshidden/strings.xml
index e453136..e453136 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw-keyshidden/strings.xml
+++ b/res/values-iw-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8e7a2f9..8e7a2f9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw/strings2.xml b/res/values-iw/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-iw/strings2.xml
+++ b/res/values-iw/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja-keysexposed/strings.xml b/res/values-ja-keysexposed/strings.xml
index ccc7d01..ccc7d01 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja-keysexposed/strings.xml
+++ b/res/values-ja-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja-keyshidden/strings.xml b/res/values-ja-keyshidden/strings.xml
index 6dc7eb7..6dc7eb7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja-keyshidden/strings.xml
+++ b/res/values-ja-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3a4bb18..3a4bb18 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja/strings2.xml b/res/values-ja/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ja/strings2.xml
+++ b/res/values-ja/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-keysexposed/strings.xml b/res/values-keysexposed/strings.xml
index 0c520aa..0c520aa 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-keysexposed/strings.xml
+++ b/res/values-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-keyshidden/strings.xml b/res/values-keyshidden/strings.xml
index bf01724..bf01724 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-keyshidden/strings.xml
+++ b/res/values-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko-keysexposed/strings.xml b/res/values-ko-keysexposed/strings.xml
index 56ddbf6..56ddbf6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko-keysexposed/strings.xml
+++ b/res/values-ko-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko-keyshidden/strings.xml b/res/values-ko-keyshidden/strings.xml
index 616682e..616682e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko-keyshidden/strings.xml
+++ b/res/values-ko-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7b020f6..7b020f6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko/strings2.xml b/res/values-ko/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ko/strings2.xml
+++ b/res/values-ko/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt-keysexposed/strings.xml b/res/values-lt-keysexposed/strings.xml
index 30ffdb3..30ffdb3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt-keysexposed/strings.xml
+++ b/res/values-lt-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt-keyshidden/strings.xml b/res/values-lt-keyshidden/strings.xml
index ad18a1a..ad18a1a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt-keyshidden/strings.xml
+++ b/res/values-lt-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3f8650b..3f8650b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt/strings2.xml b/res/values-lt/strings2.xml
index 92594f2..92594f2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lt/strings2.xml
+++ b/res/values-lt/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv-keysexposed/strings.xml b/res/values-lv-keysexposed/strings.xml
index cb7196c..cb7196c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv-keysexposed/strings.xml
+++ b/res/values-lv-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv-keyshidden/strings.xml b/res/values-lv-keyshidden/strings.xml
index 9341376..9341376 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv-keyshidden/strings.xml
+++ b/res/values-lv-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 39c5b9b..39c5b9b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv/strings2.xml b/res/values-lv/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-lv/strings2.xml
+++ b/res/values-lv/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms-keysexposed/strings.xml b/res/values-ms-keysexposed/strings.xml
index 51ce8a5..51ce8a5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms-keysexposed/strings.xml
+++ b/res/values-ms-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms-keyshidden/strings.xml b/res/values-ms-keyshidden/strings.xml
index 545aa0f..545aa0f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms-keyshidden/strings.xml
+++ b/res/values-ms-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms/strings.xml b/res/values-ms/strings.xml
index eebc6cb..eebc6cb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms/strings2.xml b/res/values-ms/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ms/strings2.xml
+++ b/res/values-ms/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb-keysexposed/strings.xml b/res/values-nb-keysexposed/strings.xml
index e26c107..e26c107 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb-keysexposed/strings.xml
+++ b/res/values-nb-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb-keyshidden/strings.xml b/res/values-nb-keyshidden/strings.xml
index 96f2edc..96f2edc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb-keyshidden/strings.xml
+++ b/res/values-nb-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bab4a07..bab4a07 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb/strings2.xml b/res/values-nb/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nb/strings2.xml
+++ b/res/values-nb/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl-keysexposed/strings.xml b/res/values-nl-keysexposed/strings.xml
index 283c096..283c096 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl-keysexposed/strings.xml
+++ b/res/values-nl-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl-keyshidden/strings.xml b/res/values-nl-keyshidden/strings.xml
index 51f85b2..51f85b2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl-keyshidden/strings.xml
+++ b/res/values-nl-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c26cb61..c26cb61 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl/strings2.xml b/res/values-nl/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-nl/strings2.xml
+++ b/res/values-nl/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl-keysexposed/strings.xml b/res/values-pl-keysexposed/strings.xml
index cfc1f86..cfc1f86 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl-keysexposed/strings.xml
+++ b/res/values-pl-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl-keyshidden/strings.xml b/res/values-pl-keyshidden/strings.xml
index 5625cf3..5625cf3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl-keyshidden/strings.xml
+++ b/res/values-pl-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e124b80..e124b80 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl/strings2.xml b/res/values-pl/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pl/strings2.xml
+++ b/res/values-pl/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-keysexposed/strings.xml b/res/values-pt-keysexposed/strings.xml
index ddcf07c..ddcf07c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-keysexposed/strings.xml
+++ b/res/values-pt-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-keyshidden/strings.xml b/res/values-pt-keyshidden/strings.xml
index 0da8c8f..0da8c8f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-keyshidden/strings.xml
+++ b/res/values-pt-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT-keysexposed/strings.xml b/res/values-pt-rPT-keysexposed/strings.xml
index e53b8fc..e53b8fc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT-keysexposed/strings.xml
+++ b/res/values-pt-rPT-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT-keyshidden/strings.xml b/res/values-pt-rPT-keyshidden/strings.xml
index c7babbd..c7babbd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT-keyshidden/strings.xml
+++ b/res/values-pt-rPT-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6b106dc..6b106dc 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT/strings2.xml b/res/values-pt-rPT/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt-rPT/strings2.xml
+++ b/res/values-pt-rPT/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a421b92..a421b92 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt/strings2.xml b/res/values-pt/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-pt/strings2.xml
+++ b/res/values-pt/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm-keysexposed/strings.xml b/res/values-rm-keysexposed/strings.xml
index e815a28..e815a28 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm-keysexposed/strings.xml
+++ b/res/values-rm-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm-keyshidden/strings.xml b/res/values-rm-keyshidden/strings.xml
index d30bce5..d30bce5 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm-keyshidden/strings.xml
+++ b/res/values-rm-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5596b7d..5596b7d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro-keysexposed/strings.xml b/res/values-ro-keysexposed/strings.xml
index 8d7909d..8d7909d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro-keysexposed/strings.xml
+++ b/res/values-ro-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro-keyshidden/strings.xml b/res/values-ro-keyshidden/strings.xml
index 3001754..3001754 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro-keyshidden/strings.xml
+++ b/res/values-ro-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bee8511..bee8511 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro/strings2.xml b/res/values-ro/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ro/strings2.xml
+++ b/res/values-ro/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru-keysexposed/strings.xml b/res/values-ru-keysexposed/strings.xml
index 74191db..74191db 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru-keysexposed/strings.xml
+++ b/res/values-ru-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru-keyshidden/strings.xml b/res/values-ru-keyshidden/strings.xml
index bea4df4..bea4df4 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru-keyshidden/strings.xml
+++ b/res/values-ru-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9452281..9452281 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru/strings2.xml b/res/values-ru/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-ru/strings2.xml
+++ b/res/values-ru/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk-keysexposed/strings.xml b/res/values-sk-keysexposed/strings.xml
index 27cf20c..27cf20c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk-keysexposed/strings.xml
+++ b/res/values-sk-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk-keyshidden/strings.xml b/res/values-sk-keyshidden/strings.xml
index b8c8841..b8c8841 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk-keyshidden/strings.xml
+++ b/res/values-sk-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2d5e4c9..2d5e4c9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk/strings2.xml b/res/values-sk/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sk/strings2.xml
+++ b/res/values-sk/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl-keysexposed/strings.xml b/res/values-sl-keysexposed/strings.xml
index 8db3d64..8db3d64 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl-keysexposed/strings.xml
+++ b/res/values-sl-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl-keyshidden/strings.xml b/res/values-sl-keyshidden/strings.xml
index 19de648..19de648 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl-keyshidden/strings.xml
+++ b/res/values-sl-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dcb9b0e..dcb9b0e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl/strings2.xml b/res/values-sl/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sl/strings2.xml
+++ b/res/values-sl/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr-keysexposed/strings.xml b/res/values-sr-keysexposed/strings.xml
index 2140d67..2140d67 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr-keysexposed/strings.xml
+++ b/res/values-sr-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr-keyshidden/strings.xml b/res/values-sr-keyshidden/strings.xml
index 1ed388b..1ed388b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr-keyshidden/strings.xml
+++ b/res/values-sr-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1185378..1185378 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr/strings2.xml b/res/values-sr/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sr/strings2.xml
+++ b/res/values-sr/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv-keysexposed/strings.xml b/res/values-sv-keysexposed/strings.xml
index 5e3be4b..5e3be4b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv-keysexposed/strings.xml
+++ b/res/values-sv-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv-keyshidden/strings.xml b/res/values-sv-keyshidden/strings.xml
index 11ca105..11ca105 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv-keyshidden/strings.xml
+++ b/res/values-sv-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cfe3412..cfe3412 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv/strings2.xml b/res/values-sv/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sv/strings2.xml
+++ b/res/values-sv/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw-keysexposed/strings.xml b/res/values-sw-keysexposed/strings.xml
index b90aeaa..b90aeaa 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw-keysexposed/strings.xml
+++ b/res/values-sw-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw-keyshidden/strings.xml b/res/values-sw-keyshidden/strings.xml
index dbf81b8..dbf81b8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw-keyshidden/strings.xml
+++ b/res/values-sw-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a706648..a706648 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw/strings2.xml b/res/values-sw/strings2.xml
index 55c62b9..55c62b9 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-sw/strings2.xml
+++ b/res/values-sw/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th-keysexposed/strings.xml b/res/values-th-keysexposed/strings.xml
index 9cd7c10..9cd7c10 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th-keysexposed/strings.xml
+++ b/res/values-th-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th-keyshidden/strings.xml b/res/values-th-keyshidden/strings.xml
index 2f4bfd2..2f4bfd2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th-keyshidden/strings.xml
+++ b/res/values-th-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th/strings.xml b/res/values-th/strings.xml
index 860b445..860b445 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th/strings2.xml b/res/values-th/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-th/strings2.xml
+++ b/res/values-th/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl-keysexposed/strings.xml b/res/values-tl-keysexposed/strings.xml
index 2a809b2..2a809b2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl-keysexposed/strings.xml
+++ b/res/values-tl-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl-keyshidden/strings.xml b/res/values-tl-keyshidden/strings.xml
index 8096816..8096816 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl-keyshidden/strings.xml
+++ b/res/values-tl-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f3a0d40..f3a0d40 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl/strings2.xml b/res/values-tl/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tl/strings2.xml
+++ b/res/values-tl/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr-keysexposed/strings.xml b/res/values-tr-keysexposed/strings.xml
index e9ceeef..e9ceeef 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr-keysexposed/strings.xml
+++ b/res/values-tr-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr-keyshidden/strings.xml b/res/values-tr-keyshidden/strings.xml
index a61c445..a61c445 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr-keyshidden/strings.xml
+++ b/res/values-tr-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5abcbc2..5abcbc2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr/strings2.xml b/res/values-tr/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-tr/strings2.xml
+++ b/res/values-tr/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk-keysexposed/strings.xml b/res/values-uk-keysexposed/strings.xml
index e8e2821..e8e2821 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk-keysexposed/strings.xml
+++ b/res/values-uk-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk-keyshidden/strings.xml b/res/values-uk-keyshidden/strings.xml
index 04d8003..04d8003 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk-keyshidden/strings.xml
+++ b/res/values-uk-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 36ad1f3..36ad1f3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk/strings2.xml b/res/values-uk/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-uk/strings2.xml
+++ b/res/values-uk/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi-keysexposed/strings.xml b/res/values-vi-keysexposed/strings.xml
index e9c3dc8..e9c3dc8 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi-keysexposed/strings.xml
+++ b/res/values-vi-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi-keyshidden/strings.xml b/res/values-vi-keyshidden/strings.xml
index 2d8edbd..2d8edbd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi-keyshidden/strings.xml
+++ b/res/values-vi-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 241934f..241934f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi/strings2.xml b/res/values-vi/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-vi/strings2.xml
+++ b/res/values-vi/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN-keysexposed/strings.xml b/res/values-zh-rCN-keysexposed/strings.xml
index d54322f..d54322f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN-keysexposed/strings.xml
+++ b/res/values-zh-rCN-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN-keyshidden/strings.xml b/res/values-zh-rCN-keyshidden/strings.xml
index 3903683..3903683 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN-keyshidden/strings.xml
+++ b/res/values-zh-rCN-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6bcf327..6bcf327 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN/strings2.xml b/res/values-zh-rCN/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rCN/strings2.xml
+++ b/res/values-zh-rCN/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW-keysexposed/strings.xml b/res/values-zh-rTW-keysexposed/strings.xml
index a76480e..a76480e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW-keysexposed/strings.xml
+++ b/res/values-zh-rTW-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW-keyshidden/strings.xml b/res/values-zh-rTW-keyshidden/strings.xml
index 396ae31..396ae31 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW-keyshidden/strings.xml
+++ b/res/values-zh-rTW-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cc5785e..cc5785e 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW/strings2.xml b/res/values-zh-rTW/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zh-rTW/strings2.xml
+++ b/res/values-zh-rTW/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu-keysexposed/strings.xml b/res/values-zu-keysexposed/strings.xml
index e3bded1..e3bded1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu-keysexposed/strings.xml
+++ b/res/values-zu-keysexposed/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu-keyshidden/strings.xml b/res/values-zu-keyshidden/strings.xml
index e9f290a..e9f290a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu-keyshidden/strings.xml
+++ b/res/values-zu-keyshidden/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 341d4e3..341d4e3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu/strings2.xml b/res/values-zu/strings2.xml
index 9bfb7af..9bfb7af 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values-zu/strings2.xml
+++ b/res/values-zu/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/colors.xml b/res/values/colors.xml
index 05e3233..05e3233 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/colors.xml
+++ b/res/values/colors.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/dimens.xml b/res/values/dimens.xml
index 76e33d7..76e33d7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/dimens.xml
+++ b/res/values/dimens.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml b/res/values/strings.xml
index 7c2dd2d..7c2dd2d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml
+++ b/res/values/strings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings2.xml b/res/values/strings2.xml
index 2381e8d..2381e8d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings2.xml
+++ b/res/values/strings2.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget1x1_info.xml b/res/xml/appwidget1x1_info.xml
index 00df66f..00df66f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget1x1_info.xml
+++ b/res/xml/appwidget1x1_info.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget3x1_info.xml b/res/xml/appwidget3x1_info.xml
index 65c491c..883f7a1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget3x1_info.xml
+++ b/res/xml/appwidget3x1_info.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-     Copyright (C) 2009 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.

--->

-

-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"

-    android:initialLayout="@layout/album_appwidget3x1"

-    android:minHeight="40dp"

-    android:minWidth="180dp"

-    android:updatePeriodMillis="0" >

-

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2009 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.
+-->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/album_appwidget3x1"
+    android:minHeight="40dp"
+    android:minWidth="180dp"
+    android:updatePeriodMillis="0" >
+
 </appwidget-provider>
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget4x1_info.xml b/res/xml/appwidget4x1_info.xml
index cc665a1..cc665a1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget4x1_info.xml
+++ b/res/xml/appwidget4x1_info.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget4x2_info.xml b/res/xml/appwidget4x2_info.xml
index 50094a3..4653c8a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/appwidget4x2_info.xml
+++ b/res/xml/appwidget4x2_info.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2009 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.

--->

-

-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"

-    android:minWidth="250dp"

-    android:minHeight="110dp"

-    android:updatePeriodMillis="0"

-    android:initialLayout="@layout/album_appwidget4x2"

-    >

-</appwidget-provider>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/album_appwidget4x2"
+    >
+</appwidget-provider>
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/searchable.xml b/res/xml/searchable.xml
index b00f540..b00f540 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml b/res/xml/settings.xml
index cd2fde6..cd2fde6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml
+++ b/res/xml/settings.xml
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index 751dca7..751dca7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index 80ec0c2..80ec0c2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AudioPreview.java b/src/com/android/music/AudioPreview.java
index 85ee662..85ee662 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AudioPreview.java
+++ b/src/com/android/music/AudioPreview.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/CheckableRelativeLayout.java b/src/com/android/music/CheckableRelativeLayout.java
index 25c837b..25c837b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/CheckableRelativeLayout.java
+++ b/src/com/android/music/CheckableRelativeLayout.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ColorPicker.java b/src/com/android/music/ColorPicker.java
index 4b034b1..4b034b1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ColorPicker.java
+++ b/src/com/android/music/ColorPicker.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/CreatePlaylist.java b/src/com/android/music/CreatePlaylist.java
index 89ce7ca..89ce7ca 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/CreatePlaylist.java
+++ b/src/com/android/music/CreatePlaylist.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/DeleteItems.java b/src/com/android/music/DeleteItems.java
index def8a42..def8a42 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/DeleteItems.java
+++ b/src/com/android/music/DeleteItems.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/IMediaPlaybackService.aidl b/src/com/android/music/IMediaPlaybackService.aidl
index d92d369..f816ab3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/IMediaPlaybackService.aidl
+++ b/src/com/android/music/IMediaPlaybackService.aidl
@@ -1,60 +1,60 @@
-/* //device/samples/SampleCode/src/com/android/samples/app/RemoteServiceInterface.java

-**

-** Copyright 2007, 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.

-*/

-

-package com.android.music;

-

-import android.graphics.Bitmap;

-

-interface IMediaPlaybackService

-{

-    void openFile(String path);

-    void open(in long [] list, int position);

-    int getQueuePosition();

-    boolean isPlaying();

-    void stop();

-    void pause();

-    void play();

-    void prev();

-    void next();

-    void cycleRepeat();

-    void toggleShuffle();

-    long duration();

-    long position();

-    long seek(long pos);

-    String getTrackName();

-    String getAlbumName();

-    long getAlbumId();

-    String getArtistName();

-    long getArtistId();

-    String getAlbumartistName();

-    long getAlbumartistId();

-    void enqueue(in long [] list, int action);

-    long [] getQueue();

-    void moveQueueItem(int from, int to);

-    void setQueuePosition(int index);

-    String getPath();

-    long getAudioId();

-    void setShuffleMode(int shufflemode);

-    int getShuffleMode();

-    int removeTracks(int first, int last);

-    int removeTrack(long id);

-    void setRepeatMode(int repeatmode);

-    int getRepeatMode();

-    int getMediaMountedCount();

-    int getAudioSessionId();

-}

-

+/* //device/samples/SampleCode/src/com/android/samples/app/RemoteServiceInterface.java
+**
+** Copyright 2007, 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.
+*/
+
+package com.android.music;
+
+import android.graphics.Bitmap;
+
+interface IMediaPlaybackService
+{
+    void openFile(String path);
+    void open(in long [] list, int position);
+    int getQueuePosition();
+    boolean isPlaying();
+    void stop();
+    void pause();
+    void play();
+    void prev();
+    void next();
+    void cycleRepeat();
+    void toggleShuffle();
+    long duration();
+    long position();
+    long seek(long pos);
+    String getTrackName();
+    String getAlbumName();
+    long getAlbumId();
+    String getArtistName();
+    long getArtistId();
+    String getAlbumartistName();
+    long getAlbumartistId();
+    void enqueue(in long [] list, int action);
+    long [] getQueue();
+    void moveQueueItem(int from, int to);
+    void setQueuePosition(int index);
+    String getPath();
+    long getAudioId();
+    void setShuffleMode(int shufflemode);
+    int getShuffleMode();
+    int removeTracks(int first, int last);
+    int removeTrack(long id);
+    void setRepeatMode(int repeatmode);
+    int getRepeatMode();
+    int getMediaMountedCount();
+    int getAudioSessionId();
+}
+
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider1x1.java b/src/com/android/music/MediaAppWidgetProvider1x1.java
index 9c5b113..977348b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider1x1.java
+++ b/src/com/android/music/MediaAppWidgetProvider1x1.java
@@ -1,182 +1,182 @@
-/*

- * Copyright (C) 2009 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.

- */

-

-package com.android.music;

-

-import android.app.PendingIntent;

-import android.appwidget.AppWidgetManager;

-import android.appwidget.AppWidgetProvider;

-import android.content.ComponentName;

-import android.content.Context;

-import android.content.Intent;

-import android.net.Uri;

-import android.view.View;

-import android.widget.RemoteViews;

-

-/**

- * Simple widget to show currently playing album art along with play/pause and

- * next track buttons.

- */

-public class MediaAppWidgetProvider1x1 extends AppWidgetProvider {

-	static final String TAG = "MusicAppWidgetProvider1x1";

-

-	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate1x1";

-

-	private static MediaAppWidgetProvider1x1 sInstance;

-

-	static synchronized MediaAppWidgetProvider1x1 getInstance() {

-		if (sInstance == null) {

-			sInstance = new MediaAppWidgetProvider1x1();

-		}

-		return sInstance;

-	}

-

-	@Override

-	public void onUpdate(Context context, AppWidgetManager appWidgetManager,

-			int[] appWidgetIds) {

-		defaultAppWidget(context, appWidgetIds);

-

-		// Send broadcast intent to any running MediaPlaybackService so it can

-		// wrap around with an immediate update.

-		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);

-		updateIntent.putExtra(MediaPlaybackService.CMDNAME,

-				MediaAppWidgetProvider1x1.CMDAPPWIDGETUPDATE);

-		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,

-				appWidgetIds);

-		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

-		context.sendBroadcast(updateIntent);

-	}

-

-	/**

-	 * Initialize given widgets to default state, where we launch Music on

-	 * default click and hide actions if service not running.

-	 */

-	private void defaultAppWidget(Context context, int[] appWidgetIds) {

-		final RemoteViews views = new RemoteViews(context.getPackageName(),

-				R.layout.album_appwidget1x1);

-

-		views.setImageViewResource(R.id.albumart, View.GONE);

-

-		linkButtons(context, views, false /* not playing */);

-		pushUpdate(context, appWidgetIds, views);

-	}

-

-	private void pushUpdate(Context context, int[] appWidgetIds,

-			RemoteViews views) {

-		// Update specific list of appWidgetIds if given, otherwise default to

-		// all

-		final AppWidgetManager gm = AppWidgetManager.getInstance(context);

-		if (appWidgetIds != null) {

-			gm.updateAppWidget(appWidgetIds, views);

-		} else {

-			gm.updateAppWidget(new ComponentName(context, this.getClass()),

-					views);

-		}

-	}

-

-	/**

-	 * Check against {@link AppWidgetManager} if there are any instances of this

-	 * widget.

-	 */

-	private boolean hasInstances(Context context) {

-		AppWidgetManager appWidgetManager = AppWidgetManager

-				.getInstance(context);

-		int[] appWidgetIds = appWidgetManager

-				.getAppWidgetIds(new ComponentName(context, this.getClass()));

-		return (appWidgetIds.length > 0);

-	}

-

-	/**

-	 * Handle a change notification coming over from

-	 * {@link MediaPlaybackService}

-	 */

-	void notifyChange(MediaPlaybackService service, String what) {

-		if (hasInstances(service)) {

-			if (MediaPlaybackService.META_CHANGED.equals(what)

-					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)

-					|| MediaPlaybackService.REPEATMODE_CHANGED.equals(what)

-					|| MediaPlaybackService.SHUFFLEMODE_CHANGED.equals(what)) {

-				performUpdate(service, null);

-			}

-		}

-	}

-

-	/**

-	 * Update all active widget instances by pushing changes

-	 */

-	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {

-		final RemoteViews views = new RemoteViews(service.getPackageName(),

-				R.layout.album_appwidget1x1);

-

-		CharSequence titleName = service.getTrackName();

-		CharSequence artistName = service.getArtistName();

-		long albumId = service.getAlbumId();

-		long songId = service.getAudioId();

-		{

-			// No error, so show normal titles and artwork

-			views.setTextViewText(R.id.title, titleName);

-			views.setTextViewText(R.id.artist, artistName);

-			views.setViewVisibility(R.id.albumart, View.VISIBLE);

-			// Set album art

-			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);

-			if (uri != null) {

-				views.setImageViewUri(R.id.albumart, uri);

-			} else {

-				views.setImageViewResource(R.id.albumart,

-						R.drawable.albumart_mp_unknown);

-			}

-		}

-		// Set correct drawable for pause state

-		final boolean playing = service.isPlaying();

-		if (playing) {

-			views.setImageViewResource(R.id.play_pause,

-					R.drawable.appwidget_pause_normal);

-		} else {

-			views.setImageViewResource(R.id.play_pause,

-					R.drawable.appwidget_play_normal);

-		}

-

-		// Link actions buttons to intents

-		linkButtons(service, views, playing);

-

-		pushUpdate(service, appWidgetIds, views);

-	}

-

-	/**

-	 * Link up various button actions using {@link PendingIntents}.

-	 * 

-	 * @param playerActive

-	 *            True if player is active in background, which means widget

-	 *            click will launch {@link MediaPlaybackActivity}, otherwise we

-	 *            launch {@link MusicBrowserActivity}.

-	 */

-	private void linkButtons(Context context, RemoteViews views,

-			boolean playerActive) {

-		// Connect up various buttons and touch events

-		Intent intent;

-		PendingIntent pendingIntent;

-

-		final ComponentName serviceName = new ComponentName(context,

-				MediaPlaybackService.class);

-

-		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-

-	}

-}

+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.android.music;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.RemoteViews;
+
+/**
+ * Simple widget to show currently playing album art along with play/pause and
+ * next track buttons.
+ */
+public class MediaAppWidgetProvider1x1 extends AppWidgetProvider {
+	static final String TAG = "MusicAppWidgetProvider1x1";
+
+	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate1x1";
+
+	private static MediaAppWidgetProvider1x1 sInstance;
+
+	static synchronized MediaAppWidgetProvider1x1 getInstance() {
+		if (sInstance == null) {
+			sInstance = new MediaAppWidgetProvider1x1();
+		}
+		return sInstance;
+	}
+
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+			int[] appWidgetIds) {
+		defaultAppWidget(context, appWidgetIds);
+
+		// Send broadcast intent to any running MediaPlaybackService so it can
+		// wrap around with an immediate update.
+		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);
+		updateIntent.putExtra(MediaPlaybackService.CMDNAME,
+				MediaAppWidgetProvider1x1.CMDAPPWIDGETUPDATE);
+		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,
+				appWidgetIds);
+		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+		context.sendBroadcast(updateIntent);
+	}
+
+	/**
+	 * Initialize given widgets to default state, where we launch Music on
+	 * default click and hide actions if service not running.
+	 */
+	private void defaultAppWidget(Context context, int[] appWidgetIds) {
+		final RemoteViews views = new RemoteViews(context.getPackageName(),
+				R.layout.album_appwidget1x1);
+
+		views.setImageViewResource(R.id.albumart, View.GONE);
+
+		linkButtons(context, views, false /* not playing */);
+		pushUpdate(context, appWidgetIds, views);
+	}
+
+	private void pushUpdate(Context context, int[] appWidgetIds,
+			RemoteViews views) {
+		// Update specific list of appWidgetIds if given, otherwise default to
+		// all
+		final AppWidgetManager gm = AppWidgetManager.getInstance(context);
+		if (appWidgetIds != null) {
+			gm.updateAppWidget(appWidgetIds, views);
+		} else {
+			gm.updateAppWidget(new ComponentName(context, this.getClass()),
+					views);
+		}
+	}
+
+	/**
+	 * Check against {@link AppWidgetManager} if there are any instances of this
+	 * widget.
+	 */
+	private boolean hasInstances(Context context) {
+		AppWidgetManager appWidgetManager = AppWidgetManager
+				.getInstance(context);
+		int[] appWidgetIds = appWidgetManager
+				.getAppWidgetIds(new ComponentName(context, this.getClass()));
+		return (appWidgetIds.length > 0);
+	}
+
+	/**
+	 * Handle a change notification coming over from
+	 * {@link MediaPlaybackService}
+	 */
+	void notifyChange(MediaPlaybackService service, String what) {
+		if (hasInstances(service)) {
+			if (MediaPlaybackService.META_CHANGED.equals(what)
+					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)
+					|| MediaPlaybackService.REPEATMODE_CHANGED.equals(what)
+					|| MediaPlaybackService.SHUFFLEMODE_CHANGED.equals(what)) {
+				performUpdate(service, null);
+			}
+		}
+	}
+
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {
+		final RemoteViews views = new RemoteViews(service.getPackageName(),
+				R.layout.album_appwidget1x1);
+
+		CharSequence titleName = service.getTrackName();
+		CharSequence artistName = service.getArtistName();
+		long albumId = service.getAlbumId();
+		long songId = service.getAudioId();
+		{
+			// No error, so show normal titles and artwork
+			views.setTextViewText(R.id.title, titleName);
+			views.setTextViewText(R.id.artist, artistName);
+			views.setViewVisibility(R.id.albumart, View.VISIBLE);
+			// Set album art
+			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);
+			if (uri != null) {
+				views.setImageViewUri(R.id.albumart, uri);
+			} else {
+				views.setImageViewResource(R.id.albumart,
+						R.drawable.albumart_mp_unknown);
+			}
+		}
+		// Set correct drawable for pause state
+		final boolean playing = service.isPlaying();
+		if (playing) {
+			views.setImageViewResource(R.id.play_pause,
+					R.drawable.appwidget_pause_normal);
+		} else {
+			views.setImageViewResource(R.id.play_pause,
+					R.drawable.appwidget_play_normal);
+		}
+
+		// Link actions buttons to intents
+		linkButtons(service, views, playing);
+
+		pushUpdate(service, appWidgetIds, views);
+	}
+
+	/**
+	 * Link up various button actions using {@link PendingIntents}.
+	 * 
+	 * @param playerActive
+	 *            True if player is active in background, which means widget
+	 *            click will launch {@link MediaPlaybackActivity}, otherwise we
+	 *            launch {@link MusicBrowserActivity}.
+	 */
+	private void linkButtons(Context context, RemoteViews views,
+			boolean playerActive) {
+		// Connect up various buttons and touch events
+		Intent intent;
+		PendingIntent pendingIntent;
+
+		final ComponentName serviceName = new ComponentName(context,
+				MediaPlaybackService.class);
+
+		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider3x1.java b/src/com/android/music/MediaAppWidgetProvider3x1.java
index 699f0a1..d00549b 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider3x1.java
+++ b/src/com/android/music/MediaAppWidgetProvider3x1.java
@@ -1,212 +1,212 @@
-/*

- * Copyright (C) 2009 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.

- */

-

-package com.android.music;

-

-import android.app.PendingIntent;

-import android.appwidget.AppWidgetManager;

-import android.appwidget.AppWidgetProvider;

-import android.content.ComponentName;

-import android.content.Context;

-import android.content.Intent;

-import android.content.res.Resources;

-import android.net.Uri;

-import android.os.Environment;

-import android.view.View;

-import android.widget.RemoteViews;

-

-/**

- * Simple widget to show currently playing album art along with play/pause and

- * next track buttons.

- */

-public class MediaAppWidgetProvider3x1 extends AppWidgetProvider {

-	static final String TAG = "MusicAppWidgetProvider3x1";

-

-	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate3x1";

-

-	private static MediaAppWidgetProvider3x1 sInstance;

-

-	static synchronized MediaAppWidgetProvider3x1 getInstance() {

-		if (sInstance == null) {

-			sInstance = new MediaAppWidgetProvider3x1();

-		}

-		return sInstance;

-	}

-

-	@Override

-	public void onUpdate(Context context, AppWidgetManager appWidgetManager,

-			int[] appWidgetIds) {

-		defaultAppWidget(context, appWidgetIds);

-

-		// Send broadcast intent to any running MediaPlaybackService so it can

-		// wrap around with an immediate update.

-		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);

-		updateIntent.putExtra(MediaPlaybackService.CMDNAME,

-				MediaAppWidgetProvider3x1.CMDAPPWIDGETUPDATE);

-		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,

-				appWidgetIds);

-		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

-		context.sendBroadcast(updateIntent);

-	}

-

-	/**

-	 * Initialize given widgets to default state, where we launch Music on

-	 * default click and hide actions if service not running.

-	 */

-	private void defaultAppWidget(Context context, int[] appWidgetIds) {

-		final RemoteViews views = new RemoteViews(context.getPackageName(),

-				R.layout.album_appwidget3x1);

-

-		views.setViewVisibility(R.id.albumart, View.VISIBLE);

-

-		linkButtons(context, views /* not playing */);

-		pushUpdate(context, appWidgetIds, views);

-	}

-

-	private void pushUpdate(Context context, int[] appWidgetIds,

-			RemoteViews views) {

-		// Update specific list of appWidgetIds if given, otherwise default to

-		// all

-		final AppWidgetManager gm = AppWidgetManager.getInstance(context);

-		if (appWidgetIds != null) {

-			gm.updateAppWidget(appWidgetIds, views);

-		} else {

-			gm.updateAppWidget(new ComponentName(context, this.getClass()),

-					views);

-		}

-	}

-

-	/**

-	 * Check against {@link AppWidgetManager} if there are any instances of this

-	 * widget.

-	 */

-	private boolean hasInstances(Context context) {

-		AppWidgetManager appWidgetManager = AppWidgetManager

-				.getInstance(context);

-		int[] appWidgetIds = appWidgetManager

-				.getAppWidgetIds(new ComponentName(context, this.getClass()));

-		return (appWidgetIds.length > 0);

-	}

-

-	/**

-	 * Handle a change notification coming over from

-	 * {@link MediaPlaybackService}

-	 */

-	void notifyChange(MediaPlaybackService service, String what) {

-		if (hasInstances(service)) {

-			if (MediaPlaybackService.META_CHANGED.equals(what)

-					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)) {

-				performUpdate(service, null);

-			}

-		}

-	}

-

-	/**

-	 * Update all active widget instances by pushing changes

-	 */

-	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {

-		final Resources res = service.getResources();

-		final RemoteViews views = new RemoteViews(service.getPackageName(),

-				R.layout.album_appwidget3x1);

-

-		CharSequence titleName = service.getTrackName();

-		CharSequence artistName = service.getArtistName();

-		long albumId = service.getAlbumId();

-		long songId = service.getAudioId();

-		CharSequence errorState = null;

-

-		// Format title string with track number, or show SD card message

-		String status = Environment.getExternalStorageState();

-		if (status.equals(Environment.MEDIA_SHARED)

-				|| status.equals(Environment.MEDIA_UNMOUNTED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_busy_title);

-			} else {

-				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);

-			}

-		} else if (status.equals(Environment.MEDIA_REMOVED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_missing_title);

-			} else {

-				errorState = res

-						.getText(R.string.sdcard_missing_title_nosdcard);

-			}

-		} else if (titleName == null) {

-			errorState = res.getText(R.string.emptyplaylist);

-		}

-

-		if (errorState != null) {

-			// Show error state to user

-			views.setViewVisibility(R.id.trackname, View.GONE);

-			views.setTextViewText(R.id.artist, errorState);

-			views.setViewVisibility(R.id.albumart, View.GONE);

-		} else {

-			// No error, so show normal titles and artwork

-			views.setViewVisibility(R.id.trackname, View.VISIBLE);

-			views.setTextViewText(R.id.trackname, titleName);

-			views.setTextViewText(R.id.artistname, artistName);

-			views.setViewVisibility(R.id.albumart, View.VISIBLE);

-			// Set album art

-			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);

-			if (uri != null) {

-				views.setImageViewUri(R.id.albumart, uri);

-			} else {

-				views.setImageViewResource(R.id.albumart,

-						R.drawable.albumart_mp_unknown);

-			}

-		}

-

-		// Link actions buttons to intents

-		linkButtons(service, views);

-

-		pushUpdate(service, appWidgetIds, views);

-	}

-

-	/**

-	 * Link up various button actions using {@link PendingIntents}.

-	 * 

-	 * @param playerActive

-	 *            True if player is active in background, which means widget

-	 *            click will launch {@link MediaPlaybackActivity}, otherwise we

-	 *            launch {@link MusicBrowserActivity}.

-	 */

-	private void linkButtons(Context context, RemoteViews views) {

-		// Connect up various buttons and touch events

-		Intent intent;

-		PendingIntent pendingIntent;

-

-		final ComponentName serviceName = new ComponentName(context,

-				MediaPlaybackService.class);

-

-		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.NEXT_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.next, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.PREVIOUS_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.previous, pendingIntent);

-	}

-}

+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.android.music;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Environment;
+import android.view.View;
+import android.widget.RemoteViews;
+
+/**
+ * Simple widget to show currently playing album art along with play/pause and
+ * next track buttons.
+ */
+public class MediaAppWidgetProvider3x1 extends AppWidgetProvider {
+	static final String TAG = "MusicAppWidgetProvider3x1";
+
+	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate3x1";
+
+	private static MediaAppWidgetProvider3x1 sInstance;
+
+	static synchronized MediaAppWidgetProvider3x1 getInstance() {
+		if (sInstance == null) {
+			sInstance = new MediaAppWidgetProvider3x1();
+		}
+		return sInstance;
+	}
+
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+			int[] appWidgetIds) {
+		defaultAppWidget(context, appWidgetIds);
+
+		// Send broadcast intent to any running MediaPlaybackService so it can
+		// wrap around with an immediate update.
+		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);
+		updateIntent.putExtra(MediaPlaybackService.CMDNAME,
+				MediaAppWidgetProvider3x1.CMDAPPWIDGETUPDATE);
+		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,
+				appWidgetIds);
+		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+		context.sendBroadcast(updateIntent);
+	}
+
+	/**
+	 * Initialize given widgets to default state, where we launch Music on
+	 * default click and hide actions if service not running.
+	 */
+	private void defaultAppWidget(Context context, int[] appWidgetIds) {
+		final RemoteViews views = new RemoteViews(context.getPackageName(),
+				R.layout.album_appwidget3x1);
+
+		views.setViewVisibility(R.id.albumart, View.VISIBLE);
+
+		linkButtons(context, views /* not playing */);
+		pushUpdate(context, appWidgetIds, views);
+	}
+
+	private void pushUpdate(Context context, int[] appWidgetIds,
+			RemoteViews views) {
+		// Update specific list of appWidgetIds if given, otherwise default to
+		// all
+		final AppWidgetManager gm = AppWidgetManager.getInstance(context);
+		if (appWidgetIds != null) {
+			gm.updateAppWidget(appWidgetIds, views);
+		} else {
+			gm.updateAppWidget(new ComponentName(context, this.getClass()),
+					views);
+		}
+	}
+
+	/**
+	 * Check against {@link AppWidgetManager} if there are any instances of this
+	 * widget.
+	 */
+	private boolean hasInstances(Context context) {
+		AppWidgetManager appWidgetManager = AppWidgetManager
+				.getInstance(context);
+		int[] appWidgetIds = appWidgetManager
+				.getAppWidgetIds(new ComponentName(context, this.getClass()));
+		return (appWidgetIds.length > 0);
+	}
+
+	/**
+	 * Handle a change notification coming over from
+	 * {@link MediaPlaybackService}
+	 */
+	void notifyChange(MediaPlaybackService service, String what) {
+		if (hasInstances(service)) {
+			if (MediaPlaybackService.META_CHANGED.equals(what)
+					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)) {
+				performUpdate(service, null);
+			}
+		}
+	}
+
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {
+		final Resources res = service.getResources();
+		final RemoteViews views = new RemoteViews(service.getPackageName(),
+				R.layout.album_appwidget3x1);
+
+		CharSequence titleName = service.getTrackName();
+		CharSequence artistName = service.getArtistName();
+		long albumId = service.getAlbumId();
+		long songId = service.getAudioId();
+		CharSequence errorState = null;
+
+		// Format title string with track number, or show SD card message
+		String status = Environment.getExternalStorageState();
+		if (status.equals(Environment.MEDIA_SHARED)
+				|| status.equals(Environment.MEDIA_UNMOUNTED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_busy_title);
+			} else {
+				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);
+			}
+		} else if (status.equals(Environment.MEDIA_REMOVED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_missing_title);
+			} else {
+				errorState = res
+						.getText(R.string.sdcard_missing_title_nosdcard);
+			}
+		} else if (titleName == null) {
+			errorState = res.getText(R.string.emptyplaylist);
+		}
+
+		if (errorState != null) {
+			// Show error state to user
+			views.setViewVisibility(R.id.trackname, View.GONE);
+			views.setTextViewText(R.id.artist, errorState);
+			views.setViewVisibility(R.id.albumart, View.GONE);
+		} else {
+			// No error, so show normal titles and artwork
+			views.setViewVisibility(R.id.trackname, View.VISIBLE);
+			views.setTextViewText(R.id.trackname, titleName);
+			views.setTextViewText(R.id.artistname, artistName);
+			views.setViewVisibility(R.id.albumart, View.VISIBLE);
+			// Set album art
+			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);
+			if (uri != null) {
+				views.setImageViewUri(R.id.albumart, uri);
+			} else {
+				views.setImageViewResource(R.id.albumart,
+						R.drawable.albumart_mp_unknown);
+			}
+		}
+
+		// Link actions buttons to intents
+		linkButtons(service, views);
+
+		pushUpdate(service, appWidgetIds, views);
+	}
+
+	/**
+	 * Link up various button actions using {@link PendingIntents}.
+	 * 
+	 * @param playerActive
+	 *            True if player is active in background, which means widget
+	 *            click will launch {@link MediaPlaybackActivity}, otherwise we
+	 *            launch {@link MusicBrowserActivity}.
+	 */
+	private void linkButtons(Context context, RemoteViews views) {
+		// Connect up various buttons and touch events
+		Intent intent;
+		PendingIntent pendingIntent;
+
+		final ComponentName serviceName = new ComponentName(context,
+				MediaPlaybackService.class);
+
+		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.NEXT_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.next, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.PREVIOUS_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.previous, pendingIntent);
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java b/src/com/android/music/MediaAppWidgetProvider4x1.java
index b9097f1..babd0ab 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java
+++ b/src/com/android/music/MediaAppWidgetProvider4x1.java
@@ -1,281 +1,281 @@
-/*

- * Copyright (C) 2009 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.

- */

-

-package com.android.music;

-

-import android.app.PendingIntent;

-import android.appwidget.AppWidgetManager;

-import android.appwidget.AppWidgetProvider;

-import android.content.ComponentName;

-import android.content.Context;

-import android.content.Intent;

-import android.content.SharedPreferences;

-import android.content.pm.PackageManager;

-import android.content.pm.PackageManager.NameNotFoundException;

-import android.content.res.Resources;

-import android.graphics.Color;

-import android.net.Uri;

-import android.os.Environment;

-import android.preference.PreferenceManager;

-import android.view.View;

-import android.widget.RemoteViews;

-

-/**

- * Simple widget to show currently playing album art along with play/pause and

- * next track buttons.

- */

-

-public class MediaAppWidgetProvider4x1 extends AppWidgetProvider {

-	static final String TAG = "MusicAppWidgetProvider";

-

-	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate";

-

-	private static MediaAppWidgetProvider4x1 sInstance;

-

-	static synchronized MediaAppWidgetProvider4x1 getInstance() {

-		if (sInstance == null) {

-			sInstance = new MediaAppWidgetProvider4x1();

-		}

-		return sInstance;

-	}

-

-	@Override

-	public void onUpdate(Context context, AppWidgetManager appWidgetManager,

-			int[] appWidgetIds) {

-		defaultAppWidget(context, appWidgetIds);

-

-		// Send broadcast intent to any running MediaPlaybackService so it can

-		// wrap around with an immediate update.

-		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);

-		updateIntent.putExtra(MediaPlaybackService.CMDNAME,

-				MediaAppWidgetProvider4x1.CMDAPPWIDGETUPDATE);

-		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,

-				appWidgetIds);

-		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

-		context.sendBroadcast(updateIntent);

-	}

-

-	/**

-	 * Initialize given widgets to default state, where we launch Music on

-	 * default click and hide actions if service not running.

-	 */

-	private void defaultAppWidget(Context context, int[] appWidgetIds) {

-		final Resources res = context.getResources();

-		final RemoteViews views = new RemoteViews(context.getPackageName(),

-				R.layout.album_appwidget4x1);

-

-		views.setViewVisibility(R.id.title, View.GONE);

-		views.setTextViewText(R.id.artist,

-				res.getText(R.string.widget_initial_text));

-		views.setViewVisibility(R.id.albumart, View.GONE);

-

-		linkButtons(context, views, false /* not playing */);

-		pushUpdate(context, appWidgetIds, views);

-	}

-

-	private void pushUpdate(Context context, int[] appWidgetIds,

-			RemoteViews views) {

-		// Update specific list of appWidgetIds if given, otherwise default to

-		// all

-		final AppWidgetManager gm = AppWidgetManager.getInstance(context);

-		if (appWidgetIds != null) {

-			gm.updateAppWidget(appWidgetIds, views);

-		} else {

-			gm.updateAppWidget(new ComponentName(context, this.getClass()),

-					views);

-		}

-	}

-

-	/**

-	 * Check against {@link AppWidgetManager} if there are any instances of this

-	 * widget.

-	 */

-	private boolean hasInstances(Context context) {

-		AppWidgetManager appWidgetManager = AppWidgetManager

-				.getInstance(context);

-		int[] appWidgetIds = appWidgetManager

-				.getAppWidgetIds(new ComponentName(context, this.getClass()));

-		return (appWidgetIds.length > 0);

-	}

-

-	/**

-	 * Handle a change notification coming over from

-	 * {@link MediaPlaybackService}

-	 */

-	void notifyChange(MediaPlaybackService service, String what) {

-		if (hasInstances(service)) {

-			if (MediaPlaybackService.META_CHANGED.equals(what)

-					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)) {

-				performUpdate(service, null);

-			}

-		}

-	}

-

-	/**

-	 * Update all active widget instances by pushing changes

-	 */

-	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {

-		final Resources res = service.getResources();

-		final RemoteViews views = new RemoteViews(service.getPackageName(),

-				R.layout.album_appwidget4x1);

-

-		CharSequence titleName = service.getTrackName();

-		CharSequence artistName = service.getArtistName();

-		long albumId = service.getAlbumId();

-		long songId = service.getAudioId();

-		CharSequence errorState = null;

-

-		// Format title string with track number, or show SD card message

-		String status = Environment.getExternalStorageState();

-		if (status.equals(Environment.MEDIA_SHARED)

-				|| status.equals(Environment.MEDIA_UNMOUNTED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_busy_title);

-			} else {

-				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);

-			}

-		} else if (status.equals(Environment.MEDIA_REMOVED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_missing_title);

-			} else {

-				errorState = res

-						.getText(R.string.sdcard_missing_title_nosdcard);

-			}

-		} else if (titleName == null) {

-			errorState = res.getText(R.string.emptyplaylist);

-		}

-

-		SharedPreferences mPrefs = PreferenceManager

-				.getDefaultSharedPreferences(service);

-		int aColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_ALPHA));

-		int rColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_RED));

-		int gColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_GREEN));

-		int bColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_BLUE));

-

-		int SCREEN_SAVER_COLOR_DIM = Color.argb(aColor, rColor, gColor, bColor);

-		if (errorState != null) {

-			// Show error state to user

-			views.setViewVisibility(R.id.title, View.GONE);

-			views.setTextViewText(R.id.artist, errorState);

-			views.setViewVisibility(R.id.albumart, View.GONE);

-		} else {

-			// No error, so show normal titles and artwork

-			views.setViewVisibility(R.id.title, View.VISIBLE);

-			views.setTextViewText(R.id.title, titleName);

-			views.setTextViewText(R.id.artist, artistName);

-			views.setViewVisibility(R.id.albumart, View.VISIBLE);

-			views.setTextColor(R.id.title, SCREEN_SAVER_COLOR_DIM);

-			views.setTextColor(R.id.artist, SCREEN_SAVER_COLOR_DIM);

-			// Set album art

-			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);

-			if (uri != null) {

-				views.setImageViewUri(R.id.albumart, uri);

-			} else {

-				views.setImageViewResource(R.id.albumart,

-						R.drawable.albumart_mp_unknown);

-			}

-		}

-

-		// Set correct drawable for pause state

-		final boolean playing = service.isPlaying();

-		if (playing) {

-			views.setImageViewResource(R.id.control_play,

-					R.drawable.ic_media_pause);

-		} else {

-			views.setImageViewResource(R.id.control_play,

-					R.drawable.ic_appwidget_music_play);

-		}

-

-		// Link actions buttons to intents

-		linkButtons(service, views, playing);

-

-		pushUpdate(service, appWidgetIds, views);

-	}

-

-	/**

-	 * Link up various button actions using {@link PendingIntents}.

-	 * 

-	 * @param playerActive

-	 *            True if player is active in background, which means widget

-	 *            click will launch {@link MediaPlaybackActivity}, otherwise we

-	 *            launch {@link MusicBrowserActivity}.

-	 */

-	private void linkButtons(Context context, RemoteViews views,

-			boolean playerActive) {

-

-		// ADW: Load the specified theme

-		String themePackage = MusicUtils.getThemePackageName(context,

-				MusicSettingsActivity.THEME_DEFAULT);

-		PackageManager pm = context.getPackageManager();

-		Resources themeResources = null;

-		if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {

-			try {

-				themeResources = pm.getResourcesForApplication(themePackage);

-			} catch (NameNotFoundException e) {

-				// ADW The saved theme was uninstalled so we save the

-				// default one

-				MusicUtils.setThemePackageName(context,

-						MusicSettingsActivity.THEME_DEFAULT);

-			}

-			int trackName = themeResources.getIdentifier(

-					"four_by_one_track_name", "color", themePackage);

-			if (trackName != 0) {

-				views.setTextColor(R.id.trackname,

-						themeResources.getColor(trackName));

-			}

-			int artistName = themeResources.getIdentifier(

-					"four_by_one_artist_name", "color", themePackage);

-			if (artistName != 0) {

-				views.setTextColor(R.id.artistname,

-						themeResources.getColor(artistName));

-			}

-		}

-		// Connect up various buttons and touch events

-		Intent intent;

-		PendingIntent pendingIntent;

-

-		final ComponentName serviceName = new ComponentName(context,

-				MediaPlaybackService.class);

-

-		if (playerActive) {

-			intent = new Intent(context, MediaPlaybackActivity.class);

-			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);

-			views.setOnClickPendingIntent(R.id.album_appwidget, pendingIntent);

-			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-		} else {

-			intent = new Intent(context, MusicBrowserActivity.class);

-			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);

-			views.setOnClickPendingIntent(R.id.album_appwidget, pendingIntent);

-			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-		}

-

-		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.control_play, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.NEXT_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context,

-				0 /* no requestCode */, intent, 0 /* no flags */);

-		views.setOnClickPendingIntent(R.id.control_next, pendingIntent);

-	}

-}

+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.android.music;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.view.View;
+import android.widget.RemoteViews;
+
+/**
+ * Simple widget to show currently playing album art along with play/pause and
+ * next track buttons.
+ */
+
+public class MediaAppWidgetProvider4x1 extends AppWidgetProvider {
+	static final String TAG = "MusicAppWidgetProvider";
+
+	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate";
+
+	private static MediaAppWidgetProvider4x1 sInstance;
+
+	static synchronized MediaAppWidgetProvider4x1 getInstance() {
+		if (sInstance == null) {
+			sInstance = new MediaAppWidgetProvider4x1();
+		}
+		return sInstance;
+	}
+
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+			int[] appWidgetIds) {
+		defaultAppWidget(context, appWidgetIds);
+
+		// Send broadcast intent to any running MediaPlaybackService so it can
+		// wrap around with an immediate update.
+		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);
+		updateIntent.putExtra(MediaPlaybackService.CMDNAME,
+				MediaAppWidgetProvider4x1.CMDAPPWIDGETUPDATE);
+		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,
+				appWidgetIds);
+		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+		context.sendBroadcast(updateIntent);
+	}
+
+	/**
+	 * Initialize given widgets to default state, where we launch Music on
+	 * default click and hide actions if service not running.
+	 */
+	private void defaultAppWidget(Context context, int[] appWidgetIds) {
+		final Resources res = context.getResources();
+		final RemoteViews views = new RemoteViews(context.getPackageName(),
+				R.layout.album_appwidget4x1);
+
+		views.setViewVisibility(R.id.title, View.GONE);
+		views.setTextViewText(R.id.artist,
+				res.getText(R.string.widget_initial_text));
+		views.setViewVisibility(R.id.albumart, View.GONE);
+
+		linkButtons(context, views, false /* not playing */);
+		pushUpdate(context, appWidgetIds, views);
+	}
+
+	private void pushUpdate(Context context, int[] appWidgetIds,
+			RemoteViews views) {
+		// Update specific list of appWidgetIds if given, otherwise default to
+		// all
+		final AppWidgetManager gm = AppWidgetManager.getInstance(context);
+		if (appWidgetIds != null) {
+			gm.updateAppWidget(appWidgetIds, views);
+		} else {
+			gm.updateAppWidget(new ComponentName(context, this.getClass()),
+					views);
+		}
+	}
+
+	/**
+	 * Check against {@link AppWidgetManager} if there are any instances of this
+	 * widget.
+	 */
+	private boolean hasInstances(Context context) {
+		AppWidgetManager appWidgetManager = AppWidgetManager
+				.getInstance(context);
+		int[] appWidgetIds = appWidgetManager
+				.getAppWidgetIds(new ComponentName(context, this.getClass()));
+		return (appWidgetIds.length > 0);
+	}
+
+	/**
+	 * Handle a change notification coming over from
+	 * {@link MediaPlaybackService}
+	 */
+	void notifyChange(MediaPlaybackService service, String what) {
+		if (hasInstances(service)) {
+			if (MediaPlaybackService.META_CHANGED.equals(what)
+					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)) {
+				performUpdate(service, null);
+			}
+		}
+	}
+
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {
+		final Resources res = service.getResources();
+		final RemoteViews views = new RemoteViews(service.getPackageName(),
+				R.layout.album_appwidget4x1);
+
+		CharSequence titleName = service.getTrackName();
+		CharSequence artistName = service.getArtistName();
+		long albumId = service.getAlbumId();
+		long songId = service.getAudioId();
+		CharSequence errorState = null;
+
+		// Format title string with track number, or show SD card message
+		String status = Environment.getExternalStorageState();
+		if (status.equals(Environment.MEDIA_SHARED)
+				|| status.equals(Environment.MEDIA_UNMOUNTED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_busy_title);
+			} else {
+				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);
+			}
+		} else if (status.equals(Environment.MEDIA_REMOVED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_missing_title);
+			} else {
+				errorState = res
+						.getText(R.string.sdcard_missing_title_nosdcard);
+			}
+		} else if (titleName == null) {
+			errorState = res.getText(R.string.emptyplaylist);
+		}
+
+		SharedPreferences mPrefs = PreferenceManager
+				.getDefaultSharedPreferences(service);
+		int aColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_ALPHA));
+		int rColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_RED));
+		int gColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_GREEN));
+		int bColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_BLUE));
+
+		int SCREEN_SAVER_COLOR_DIM = Color.argb(aColor, rColor, gColor, bColor);
+		if (errorState != null) {
+			// Show error state to user
+			views.setViewVisibility(R.id.title, View.GONE);
+			views.setTextViewText(R.id.artist, errorState);
+			views.setViewVisibility(R.id.albumart, View.GONE);
+		} else {
+			// No error, so show normal titles and artwork
+			views.setViewVisibility(R.id.title, View.VISIBLE);
+			views.setTextViewText(R.id.title, titleName);
+			views.setTextViewText(R.id.artist, artistName);
+			views.setViewVisibility(R.id.albumart, View.VISIBLE);
+			views.setTextColor(R.id.title, SCREEN_SAVER_COLOR_DIM);
+			views.setTextColor(R.id.artist, SCREEN_SAVER_COLOR_DIM);
+			// Set album art
+			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);
+			if (uri != null) {
+				views.setImageViewUri(R.id.albumart, uri);
+			} else {
+				views.setImageViewResource(R.id.albumart,
+						R.drawable.albumart_mp_unknown);
+			}
+		}
+
+		// Set correct drawable for pause state
+		final boolean playing = service.isPlaying();
+		if (playing) {
+			views.setImageViewResource(R.id.control_play,
+					R.drawable.ic_media_pause);
+		} else {
+			views.setImageViewResource(R.id.control_play,
+					R.drawable.ic_appwidget_music_play);
+		}
+
+		// Link actions buttons to intents
+		linkButtons(service, views, playing);
+
+		pushUpdate(service, appWidgetIds, views);
+	}
+
+	/**
+	 * Link up various button actions using {@link PendingIntents}.
+	 * 
+	 * @param playerActive
+	 *            True if player is active in background, which means widget
+	 *            click will launch {@link MediaPlaybackActivity}, otherwise we
+	 *            launch {@link MusicBrowserActivity}.
+	 */
+	private void linkButtons(Context context, RemoteViews views,
+			boolean playerActive) {
+
+		// ADW: Load the specified theme
+		String themePackage = MusicUtils.getThemePackageName(context,
+				MusicSettingsActivity.THEME_DEFAULT);
+		PackageManager pm = context.getPackageManager();
+		Resources themeResources = null;
+		if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {
+			try {
+				themeResources = pm.getResourcesForApplication(themePackage);
+			} catch (NameNotFoundException e) {
+				// ADW The saved theme was uninstalled so we save the
+				// default one
+				MusicUtils.setThemePackageName(context,
+						MusicSettingsActivity.THEME_DEFAULT);
+			}
+			int trackName = themeResources.getIdentifier(
+					"four_by_one_track_name", "color", themePackage);
+			if (trackName != 0) {
+				views.setTextColor(R.id.trackname,
+						themeResources.getColor(trackName));
+			}
+			int artistName = themeResources.getIdentifier(
+					"four_by_one_artist_name", "color", themePackage);
+			if (artistName != 0) {
+				views.setTextColor(R.id.artistname,
+						themeResources.getColor(artistName));
+			}
+		}
+		// Connect up various buttons and touch events
+		Intent intent;
+		PendingIntent pendingIntent;
+
+		final ComponentName serviceName = new ComponentName(context,
+				MediaPlaybackService.class);
+
+		if (playerActive) {
+			intent = new Intent(context, MediaPlaybackActivity.class);
+			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+			views.setOnClickPendingIntent(R.id.album_appwidget, pendingIntent);
+			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+		} else {
+			intent = new Intent(context, MusicBrowserActivity.class);
+			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+			views.setOnClickPendingIntent(R.id.album_appwidget, pendingIntent);
+			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+		}
+
+		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.control_play, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.NEXT_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context,
+				0 /* no requestCode */, intent, 0 /* no flags */);
+		views.setOnClickPendingIntent(R.id.control_next, pendingIntent);
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java b/src/com/android/music/MediaAppWidgetProvider4x2.java
index 21c4420..8dd335d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java
+++ b/src/com/android/music/MediaAppWidgetProvider4x2.java
@@ -1,349 +1,349 @@
-/*

- * Copyright (C) 2009 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.

- */

-

-package com.android.music;

-

-import android.app.PendingIntent;

-import android.appwidget.AppWidgetManager;

-import android.appwidget.AppWidgetProvider;

-import android.content.ComponentName;

-import android.content.Context;

-import android.content.Intent;

-import android.content.SharedPreferences;

-import android.content.pm.PackageManager;

-import android.content.pm.PackageManager.NameNotFoundException;

-import android.content.res.Resources;

-import android.graphics.Color;

-import android.net.Uri;

-import android.os.Environment;

-import android.preference.PreferenceManager;

-import android.view.View;

-import android.widget.RemoteViews;

-

-/**

- * Simple widget to show currently playing album art along with play/pause and

- * next track buttons.

- */

-public class MediaAppWidgetProvider4x2 extends AppWidgetProvider {

-	static final String TAG = "MusicAppWidgetProvider4x2";

-

-	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate4x2";

-

-	// ADW Theme constants

-	public static final int THEME_ITEM_BACKGROUND = 0;

-	public static final int THEME_ITEM_FOREGROUND = 1;

-	private static MediaAppWidgetProvider4x2 sInstance;

-

-	static synchronized MediaAppWidgetProvider4x2 getInstance() {

-		if (sInstance == null) {

-			sInstance = new MediaAppWidgetProvider4x2();

-		}

-		return sInstance;

-	}

-

-	@Override

-	public void onUpdate(Context context, AppWidgetManager appWidgetManager,

-			int[] appWidgetIds) {

-		defaultAppWidget(context, appWidgetIds);

-

-		// Send broadcast intent to any running MediaPlaybackService so it can

-		// wrap around with an immediate update.

-		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);

-		updateIntent.putExtra(MediaPlaybackService.CMDNAME,

-				MediaAppWidgetProvider4x2.CMDAPPWIDGETUPDATE);

-		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,

-				appWidgetIds);

-		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

-		context.sendBroadcast(updateIntent);

-	}

-

-	/**

-	 * Initialize given widgets to default state, where we launch Music on

-	 * default click and hide actions if service not running.

-	 */

-	private void defaultAppWidget(Context context, int[] appWidgetIds) {

-		final Resources res = context.getResources();

-		final RemoteViews views = new RemoteViews(context.getPackageName(),

-				R.layout.album_appwidget4x2);

-

-		views.setViewVisibility(R.id.albumname, View.GONE);

-		views.setViewVisibility(R.id.trackname, View.GONE);

-		views.setTextViewText(R.id.artistname,

-				res.getText(R.string.widget_initial_text));

-		views.setImageViewResource(R.id.albumart,

-				R.drawable.albumart_mp_unknown);

-

-		linkButtons(context, views, false /* not playing */);

-		pushUpdate(context, appWidgetIds, views);

-	}

-

-	private void pushUpdate(Context context, int[] appWidgetIds,

-			RemoteViews views) {

-		// Update specific list of appWidgetIds if given, otherwise default to

-		// all

-		final AppWidgetManager gm = AppWidgetManager.getInstance(context);

-		if (appWidgetIds != null) {

-			gm.updateAppWidget(appWidgetIds, views);

-		} else {

-			gm.updateAppWidget(new ComponentName(context, this.getClass()),

-					views);

-		}

-	}

-

-	/**

-	 * Check against {@link AppWidgetManager} if there are any instances of this

-	 * widget.

-	 */

-	private boolean hasInstances(Context context) {

-		AppWidgetManager appWidgetManager = AppWidgetManager

-				.getInstance(context);

-		int[] appWidgetIds = appWidgetManager

-				.getAppWidgetIds(new ComponentName(context, this.getClass()));

-		return (appWidgetIds.length > 0);

-	}

-

-	/**

-	 * Handle a change notification coming over from

-	 * {@link MediaPlaybackService}

-	 */

-	void notifyChange(MediaPlaybackService service, String what) {

-		if (hasInstances(service)) {

-			if (MediaPlaybackService.META_CHANGED.equals(what)

-					|| MediaPlaybackService.PROGRESSBAR_CHANGED.equals(what)

-					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)

-					|| MediaPlaybackService.REPEATMODE_CHANGED.equals(what)

-					|| MediaPlaybackService.SHUFFLEMODE_CHANGED.equals(what)) {

-				performUpdate(service, null);

-			}

-		}

-	}

-

-	/**

-	 * Update all active widget instances by pushing changes

-	 */

-	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {

-		final Resources res = service.getResources();

-		final RemoteViews views = new RemoteViews(service.getPackageName(),

-				R.layout.album_appwidget4x2);

-

-		CharSequence artistName = service.getArtistName();

-		CharSequence albumName = service.getAlbumName();

-		CharSequence trackName = service.getTrackName();

-		long albumId = service.getAlbumId();

-		long songId = service.getAudioId();

-		long pos = service.position();

-		long dur = service.duration();

-		CharSequence errorState = null;

-

-		// Format title string with track number, or show SD card message

-		String status = Environment.getExternalStorageState();

-		if (status.equals(Environment.MEDIA_SHARED)

-				|| status.equals(Environment.MEDIA_UNMOUNTED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_busy_title);

-			} else {

-				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);

-			}

-		} else if (status.equals(Environment.MEDIA_REMOVED)) {

-			if (android.os.Environment.isExternalStorageRemovable()) {

-				errorState = res.getText(R.string.sdcard_missing_title);

-			} else {

-				errorState = res

-						.getText(R.string.sdcard_missing_title_nosdcard);

-			}

-		} else if (trackName == null) {

-			errorState = res.getText(R.string.emptyplaylist);

-		}

-		SharedPreferences mPrefs = PreferenceManager

-				.getDefaultSharedPreferences(service);

-		int aColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_ALPHA));

-		int rColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_RED));

-		int gColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_GREEN));

-		int bColor = new Integer(mPrefs.getInt(null,

-				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_BLUE));

-		int SCREEN_SAVER_COLOR_DIM = Color.argb(aColor, rColor, gColor, bColor);

-

-		if (errorState != null) {

-			// Show error state to user

-			views.setViewVisibility(R.id.albumname, View.GONE);

-			views.setViewVisibility(R.id.trackname, View.GONE);

-			views.setTextViewText(R.id.artistname, errorState);

-			views.setImageViewResource(R.id.albumart,

-					R.drawable.albumart_mp_unknown);

-		} else {

-			// No error, so show normal titles and artwork

-			views.setViewVisibility(R.id.albumname, View.VISIBLE);

-			views.setViewVisibility(R.id.trackname, View.VISIBLE);

-			views.setTextViewText(R.id.artistname, "  " + artistName);

-			views.setTextViewText(R.id.albumname, "  " + albumName);

-			views.setTextViewText(R.id.trackname, "  " + trackName);

-			views.setTextColor(R.id.artistname, SCREEN_SAVER_COLOR_DIM);

-			views.setTextColor(R.id.albumname, SCREEN_SAVER_COLOR_DIM);

-			views.setTextColor(R.id.trackname, SCREEN_SAVER_COLOR_DIM);

-			views.setProgressBar(R.id.progress, 1000, (int) (1000 * pos / dur),

-					false);

-

-			// Set album art

-			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);

-			if (uri != null) {

-				views.setImageViewUri(R.id.albumart, uri);

-			} else {

-				views.setImageViewResource(R.id.albumart,

-						R.drawable.albumart_mp_unknown);

-			}

-		}

-

-		// Set correct drawable for pause state

-		final boolean playing = service.isPlaying();

-		if (playing) {

-			views.setImageViewResource(R.id.control_play,

-					R.drawable.ic_media_pause);

-		} else {

-			views.setImageViewResource(R.id.control_play,

-					R.drawable.ic_appwidget_music_play);

-		}

-

-		// Set correct drawable for repeat state

-		switch (service.getRepeatMode()) {

-		case MediaPlaybackService.REPEAT_ALL:

-			views.setImageViewResource(R.id.control_repeat,

-					R.drawable.ic_mp_repeat_all_btn);

-			break;

-		case MediaPlaybackService.REPEAT_CURRENT:

-			views.setImageViewResource(R.id.control_repeat,

-					R.drawable.ic_mp_repeat_once_btn);

-			break;

-		default:

-			views.setImageViewResource(R.id.control_repeat,

-					R.drawable.ic_mp_repeat_off_btn);

-			break;

-		}

-

-		// Set correct drawable for shuffle state

-		switch (service.getShuffleMode()) {

-		case MediaPlaybackService.SHUFFLE_NONE:

-			views.setImageViewResource(R.id.control_shuffle,

-					R.drawable.ic_mp_shuffle_off_btn);

-			break;

-		case MediaPlaybackService.SHUFFLE_AUTO:

-			views.setImageViewResource(R.id.control_shuffle,

-					R.drawable.ic_mp_partyshuffle_on_btn);

-			break;

-		default:

-			views.setImageViewResource(R.id.control_shuffle,

-					R.drawable.ic_mp_shuffle_on_btn);

-			break;

-		}

-		// Link actions buttons to intents

-		linkButtons(service, views, playing);

-

-		pushUpdate(service, appWidgetIds, views);

-

-	}

-

-	/**

-	 * Link up various button actions using {@link PendingIntents}.

-	 * 

-	 * @param playerActive

-	 *            True if player is active in background, which means widget

-	 *            click will launch {@link MediaPlaybackActivity}, otherwise we

-	 *            launch {@link MusicBrowserActivity}.

-	 */

-	private void linkButtons(Context context, RemoteViews views,

-			boolean playerActive) {

-

-		// ADW: Load the specified theme

-		String themePackage = MusicUtils.getThemePackageName(context,

-				MusicSettingsActivity.THEME_DEFAULT);

-		PackageManager pm = context.getPackageManager();

-		Resources themeResources = null;

-		if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {

-			try {

-				themeResources = pm.getResourcesForApplication(themePackage);

-			} catch (NameNotFoundException e) {

-				// ADW The saved theme was uninstalled so we save the

-				// default one

-				MusicUtils.setThemePackageName(context,

-						MusicSettingsActivity.THEME_DEFAULT);

-			}

-			int albumName = themeResources.getIdentifier(

-					"four_by_two_album_name", "color", themePackage);

-			if (albumName != 0) {

-				views.setTextColor(R.id.albumname,

-						themeResources.getColor(albumName));

-			}

-			int trackName = themeResources.getIdentifier(

-					"four_by_two_track_name", "color", themePackage);

-			if (trackName != 0) {

-				views.setTextColor(R.id.trackname,

-						themeResources.getColor(trackName));

-			}

-			int artistName = themeResources.getIdentifier(

-					"four_by_two_artist_name", "color", themePackage);

-			if (artistName != 0) {

-				views.setTextColor(R.id.artistname,

-						themeResources.getColor(artistName));

-			}

-		}

-

-		// Connect up various buttons and touch events

-		Intent intent;

-		PendingIntent pendingIntent;

-

-		final ComponentName serviceName = new ComponentName(context,

-				MediaPlaybackService.class);

-

-		if (playerActive) {

-			intent = new Intent(context, MediaPlaybackActivity.class);

-			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);

-			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-			views.setOnClickPendingIntent(R.id.info, pendingIntent);

-		} else {

-			intent = new Intent(context, MusicBrowserActivity.class);

-			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);

-			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);

-			views.setOnClickPendingIntent(R.id.info, pendingIntent);

-		}

-

-		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);

-		views.setOnClickPendingIntent(R.id.control_play, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.NEXT_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);

-		views.setOnClickPendingIntent(R.id.control_next, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.PREVIOUS_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);

-		views.setOnClickPendingIntent(R.id.control_prev, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.CYCLEREPEAT_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);

-		views.setOnClickPendingIntent(R.id.control_repeat, pendingIntent);

-

-		intent = new Intent(MediaPlaybackService.TOGGLESHUFFLE_ACTION);

-		intent.setComponent(serviceName);

-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);

-		views.setOnClickPendingIntent(R.id.control_shuffle, pendingIntent);

-	}

-}

+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.android.music;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.view.View;
+import android.widget.RemoteViews;
+
+/**
+ * Simple widget to show currently playing album art along with play/pause and
+ * next track buttons.
+ */
+public class MediaAppWidgetProvider4x2 extends AppWidgetProvider {
+	static final String TAG = "MusicAppWidgetProvider4x2";
+
+	public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate4x2";
+
+	// ADW Theme constants
+	public static final int THEME_ITEM_BACKGROUND = 0;
+	public static final int THEME_ITEM_FOREGROUND = 1;
+	private static MediaAppWidgetProvider4x2 sInstance;
+
+	static synchronized MediaAppWidgetProvider4x2 getInstance() {
+		if (sInstance == null) {
+			sInstance = new MediaAppWidgetProvider4x2();
+		}
+		return sInstance;
+	}
+
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+			int[] appWidgetIds) {
+		defaultAppWidget(context, appWidgetIds);
+
+		// Send broadcast intent to any running MediaPlaybackService so it can
+		// wrap around with an immediate update.
+		Intent updateIntent = new Intent(MediaPlaybackService.SERVICECMD);
+		updateIntent.putExtra(MediaPlaybackService.CMDNAME,
+				MediaAppWidgetProvider4x2.CMDAPPWIDGETUPDATE);
+		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,
+				appWidgetIds);
+		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+		context.sendBroadcast(updateIntent);
+	}
+
+	/**
+	 * Initialize given widgets to default state, where we launch Music on
+	 * default click and hide actions if service not running.
+	 */
+	private void defaultAppWidget(Context context, int[] appWidgetIds) {
+		final Resources res = context.getResources();
+		final RemoteViews views = new RemoteViews(context.getPackageName(),
+				R.layout.album_appwidget4x2);
+
+		views.setViewVisibility(R.id.albumname, View.GONE);
+		views.setViewVisibility(R.id.trackname, View.GONE);
+		views.setTextViewText(R.id.artistname,
+				res.getText(R.string.widget_initial_text));
+		views.setImageViewResource(R.id.albumart,
+				R.drawable.albumart_mp_unknown);
+
+		linkButtons(context, views, false /* not playing */);
+		pushUpdate(context, appWidgetIds, views);
+	}
+
+	private void pushUpdate(Context context, int[] appWidgetIds,
+			RemoteViews views) {
+		// Update specific list of appWidgetIds if given, otherwise default to
+		// all
+		final AppWidgetManager gm = AppWidgetManager.getInstance(context);
+		if (appWidgetIds != null) {
+			gm.updateAppWidget(appWidgetIds, views);
+		} else {
+			gm.updateAppWidget(new ComponentName(context, this.getClass()),
+					views);
+		}
+	}
+
+	/**
+	 * Check against {@link AppWidgetManager} if there are any instances of this
+	 * widget.
+	 */
+	private boolean hasInstances(Context context) {
+		AppWidgetManager appWidgetManager = AppWidgetManager
+				.getInstance(context);
+		int[] appWidgetIds = appWidgetManager
+				.getAppWidgetIds(new ComponentName(context, this.getClass()));
+		return (appWidgetIds.length > 0);
+	}
+
+	/**
+	 * Handle a change notification coming over from
+	 * {@link MediaPlaybackService}
+	 */
+	void notifyChange(MediaPlaybackService service, String what) {
+		if (hasInstances(service)) {
+			if (MediaPlaybackService.META_CHANGED.equals(what)
+					|| MediaPlaybackService.PROGRESSBAR_CHANGED.equals(what)
+					|| MediaPlaybackService.PLAYSTATE_CHANGED.equals(what)
+					|| MediaPlaybackService.REPEATMODE_CHANGED.equals(what)
+					|| MediaPlaybackService.SHUFFLEMODE_CHANGED.equals(what)) {
+				performUpdate(service, null);
+			}
+		}
+	}
+
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	void performUpdate(MediaPlaybackService service, int[] appWidgetIds) {
+		final Resources res = service.getResources();
+		final RemoteViews views = new RemoteViews(service.getPackageName(),
+				R.layout.album_appwidget4x2);
+
+		CharSequence artistName = service.getArtistName();
+		CharSequence albumName = service.getAlbumName();
+		CharSequence trackName = service.getTrackName();
+		long albumId = service.getAlbumId();
+		long songId = service.getAudioId();
+		long pos = service.position();
+		long dur = service.duration();
+		CharSequence errorState = null;
+
+		// Format title string with track number, or show SD card message
+		String status = Environment.getExternalStorageState();
+		if (status.equals(Environment.MEDIA_SHARED)
+				|| status.equals(Environment.MEDIA_UNMOUNTED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_busy_title);
+			} else {
+				errorState = res.getText(R.string.sdcard_busy_title_nosdcard);
+			}
+		} else if (status.equals(Environment.MEDIA_REMOVED)) {
+			if (android.os.Environment.isExternalStorageRemovable()) {
+				errorState = res.getText(R.string.sdcard_missing_title);
+			} else {
+				errorState = res
+						.getText(R.string.sdcard_missing_title_nosdcard);
+			}
+		} else if (trackName == null) {
+			errorState = res.getText(R.string.emptyplaylist);
+		}
+		SharedPreferences mPrefs = PreferenceManager
+				.getDefaultSharedPreferences(service);
+		int aColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_ALPHA));
+		int rColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_RED));
+		int gColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_GREEN));
+		int bColor = new Integer(mPrefs.getInt(null,
+				MusicSettingsActivity.DEFAULT_SCREENSAVER_COLOR_BLUE));
+		int SCREEN_SAVER_COLOR_DIM = Color.argb(aColor, rColor, gColor, bColor);
+
+		if (errorState != null) {
+			// Show error state to user
+			views.setViewVisibility(R.id.albumname, View.GONE);
+			views.setViewVisibility(R.id.trackname, View.GONE);
+			views.setTextViewText(R.id.artistname, errorState);
+			views.setImageViewResource(R.id.albumart,
+					R.drawable.albumart_mp_unknown);
+		} else {
+			// No error, so show normal titles and artwork
+			views.setViewVisibility(R.id.albumname, View.VISIBLE);
+			views.setViewVisibility(R.id.trackname, View.VISIBLE);
+			views.setTextViewText(R.id.artistname, "  " + artistName);
+			views.setTextViewText(R.id.albumname, "  " + albumName);
+			views.setTextViewText(R.id.trackname, "  " + trackName);
+			views.setTextColor(R.id.artistname, SCREEN_SAVER_COLOR_DIM);
+			views.setTextColor(R.id.albumname, SCREEN_SAVER_COLOR_DIM);
+			views.setTextColor(R.id.trackname, SCREEN_SAVER_COLOR_DIM);
+			views.setProgressBar(R.id.progress, 1000, (int) (1000 * pos / dur),
+					false);
+
+			// Set album art
+			Uri uri = MusicUtils.getArtworkUri(service, songId, albumId);
+			if (uri != null) {
+				views.setImageViewUri(R.id.albumart, uri);
+			} else {
+				views.setImageViewResource(R.id.albumart,
+						R.drawable.albumart_mp_unknown);
+			}
+		}
+
+		// Set correct drawable for pause state
+		final boolean playing = service.isPlaying();
+		if (playing) {
+			views.setImageViewResource(R.id.control_play,
+					R.drawable.ic_media_pause);
+		} else {
+			views.setImageViewResource(R.id.control_play,
+					R.drawable.ic_appwidget_music_play);
+		}
+
+		// Set correct drawable for repeat state
+		switch (service.getRepeatMode()) {
+		case MediaPlaybackService.REPEAT_ALL:
+			views.setImageViewResource(R.id.control_repeat,
+					R.drawable.ic_mp_repeat_all_btn);
+			break;
+		case MediaPlaybackService.REPEAT_CURRENT:
+			views.setImageViewResource(R.id.control_repeat,
+					R.drawable.ic_mp_repeat_once_btn);
+			break;
+		default:
+			views.setImageViewResource(R.id.control_repeat,
+					R.drawable.ic_mp_repeat_off_btn);
+			break;
+		}
+
+		// Set correct drawable for shuffle state
+		switch (service.getShuffleMode()) {
+		case MediaPlaybackService.SHUFFLE_NONE:
+			views.setImageViewResource(R.id.control_shuffle,
+					R.drawable.ic_mp_shuffle_off_btn);
+			break;
+		case MediaPlaybackService.SHUFFLE_AUTO:
+			views.setImageViewResource(R.id.control_shuffle,
+					R.drawable.ic_mp_partyshuffle_on_btn);
+			break;
+		default:
+			views.setImageViewResource(R.id.control_shuffle,
+					R.drawable.ic_mp_shuffle_on_btn);
+			break;
+		}
+		// Link actions buttons to intents
+		linkButtons(service, views, playing);
+
+		pushUpdate(service, appWidgetIds, views);
+
+	}
+
+	/**
+	 * Link up various button actions using {@link PendingIntents}.
+	 * 
+	 * @param playerActive
+	 *            True if player is active in background, which means widget
+	 *            click will launch {@link MediaPlaybackActivity}, otherwise we
+	 *            launch {@link MusicBrowserActivity}.
+	 */
+	private void linkButtons(Context context, RemoteViews views,
+			boolean playerActive) {
+
+		// ADW: Load the specified theme
+		String themePackage = MusicUtils.getThemePackageName(context,
+				MusicSettingsActivity.THEME_DEFAULT);
+		PackageManager pm = context.getPackageManager();
+		Resources themeResources = null;
+		if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {
+			try {
+				themeResources = pm.getResourcesForApplication(themePackage);
+			} catch (NameNotFoundException e) {
+				// ADW The saved theme was uninstalled so we save the
+				// default one
+				MusicUtils.setThemePackageName(context,
+						MusicSettingsActivity.THEME_DEFAULT);
+			}
+			int albumName = themeResources.getIdentifier(
+					"four_by_two_album_name", "color", themePackage);
+			if (albumName != 0) {
+				views.setTextColor(R.id.albumname,
+						themeResources.getColor(albumName));
+			}
+			int trackName = themeResources.getIdentifier(
+					"four_by_two_track_name", "color", themePackage);
+			if (trackName != 0) {
+				views.setTextColor(R.id.trackname,
+						themeResources.getColor(trackName));
+			}
+			int artistName = themeResources.getIdentifier(
+					"four_by_two_artist_name", "color", themePackage);
+			if (artistName != 0) {
+				views.setTextColor(R.id.artistname,
+						themeResources.getColor(artistName));
+			}
+		}
+
+		// Connect up various buttons and touch events
+		Intent intent;
+		PendingIntent pendingIntent;
+
+		final ComponentName serviceName = new ComponentName(context,
+				MediaPlaybackService.class);
+
+		if (playerActive) {
+			intent = new Intent(context, MediaPlaybackActivity.class);
+			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+			views.setOnClickPendingIntent(R.id.info, pendingIntent);
+		} else {
+			intent = new Intent(context, MusicBrowserActivity.class);
+			pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+			views.setOnClickPendingIntent(R.id.albumart, pendingIntent);
+			views.setOnClickPendingIntent(R.id.info, pendingIntent);
+		}
+
+		intent = new Intent(MediaPlaybackService.TOGGLEPAUSE_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+		views.setOnClickPendingIntent(R.id.control_play, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.NEXT_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+		views.setOnClickPendingIntent(R.id.control_next, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.PREVIOUS_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+		views.setOnClickPendingIntent(R.id.control_prev, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.CYCLEREPEAT_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+		views.setOnClickPendingIntent(R.id.control_repeat, pendingIntent);
+
+		intent = new Intent(MediaPlaybackService.TOGGLESHUFFLE_ACTION);
+		intent.setComponent(serviceName);
+		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+		views.setOnClickPendingIntent(R.id.control_shuffle, pendingIntent);
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaButtonIntentReceiver.java b/src/com/android/music/MediaButtonIntentReceiver.java
index fadda52..9a8b810 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaButtonIntentReceiver.java
+++ b/src/com/android/music/MediaButtonIntentReceiver.java
@@ -1,170 +1,170 @@
-/*

- * Copyright (C) 2007 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.

- */

-

-package com.android.music;

-

-import android.content.BroadcastReceiver;

-import android.content.Context;

-import android.content.Intent;

-import android.media.AudioManager;

-import android.os.Handler;

-import android.os.Message;

-import android.view.KeyEvent;

-

-/**

- * 

- */

-public class MediaButtonIntentReceiver extends BroadcastReceiver {

-

-	private static final int MSG_LONGPRESS_TIMEOUT = 1;

-

-	private static final int LONG_PRESS_DELAY = 1000;

-

-	private static long mLastClickTime = 0;

-	private static boolean mDown = false;

-	private static boolean mLaunched = false;

-

-	private static Handler mHandler = new Handler() {

-		@Override

-		public void handleMessage(Message msg) {

-			switch (msg.what) {

-			case MSG_LONGPRESS_TIMEOUT:

-				if (!mLaunched) {

-					Context context = (Context) msg.obj;

-					Intent i = new Intent();

-					i.putExtra("autoshuffle", "true");

-					i.setClass(context, MusicBrowserActivity.class);

-					i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

-							| Intent.FLAG_ACTIVITY_CLEAR_TOP);

-					context.startActivity(i);

-					mLaunched = true;

-				}

-				break;

-			}

-		}

-	};

-

-	@Override

-	public void onReceive(Context context, Intent intent) {

-		String intentAction = intent.getAction();

-

-		if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(intentAction)) {

-			Intent i = new Intent(context, MediaPlaybackService.class);

-			i.setAction(MediaPlaybackService.SERVICECMD);

-			i.putExtra(MediaPlaybackService.CMDNAME,

-					MediaPlaybackService.CMDPAUSE);

-			context.startService(i);

-		} else if (Intent.ACTION_MEDIA_BUTTON.equals(intentAction)) {

-			KeyEvent event = (KeyEvent) intent

-					.getParcelableExtra(Intent.EXTRA_KEY_EVENT);

-

-			if (event == null) {

-				return;

-			}

-

-			int keycode = event.getKeyCode();

-			int action = event.getAction();

-			long eventtime = event.getEventTime();

-			int buttonId = intent.getIntExtra(MediaPlaybackService.CMDNOTIF, 0);

-

-			// single quick press: pause/resume.

-			// double press: next track

-			// long press: start auto-shuffle mode.

-

-			String command = null;

-			switch (keycode) {

-			case KeyEvent.KEYCODE_MEDIA_STOP:

-				command = MediaPlaybackService.CMDSTOP;

-				break;

-			case KeyEvent.KEYCODE_HEADSETHOOK:

-			case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

-				command = MediaPlaybackService.CMDTOGGLEPAUSE;

-

-				break;

-			case KeyEvent.KEYCODE_MEDIA_NEXT:

-				command = MediaPlaybackService.CMDNEXT;

-

-				break;

-			case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

-				command = MediaPlaybackService.CMDPREVIOUS;

-

-				break;

-

-			}

-

-			if (command != null) {

-				if (action == KeyEvent.ACTION_DOWN) {

-					if (mDown && (buttonId == 0)) {

-						if ((MediaPlaybackService.CMDTOGGLEPAUSE

-								.equals(command) || MediaPlaybackService.CMDPLAY

-								.equals(command))

-								&& mLastClickTime != 0

-								&& eventtime - mLastClickTime > LONG_PRESS_DELAY) {

-							mHandler.sendMessage(mHandler.obtainMessage(

-									MSG_LONGPRESS_TIMEOUT, context));

-

-						}

-					} else if (event.getRepeatCount() == 0) {

-

-						// only consider the first event in a sequence, not the

-						// repeat events,

-						// so that we don't trigger in cases where the first

-						// event went to

-						// a different app (e.g. when the user ends a phone call

-						// by

-						// long pressing the headset button)

-

-						// The service may or may not be running, but we need to

-						// send it

-

-						// a command.

-						Intent i = new Intent(context,

-								MediaPlaybackService.class);

-

-						i.setAction(MediaPlaybackService.SERVICECMD);

-						if (keycode == KeyEvent.KEYCODE_HEADSETHOOK

-								&& eventtime - mLastClickTime < 300) {

-							i.putExtra(MediaPlaybackService.CMDNAME,

-									MediaPlaybackService.CMDNEXT);

-

-							context.startService(i);

-							mLastClickTime = 0;

-						} else {

-							i.putExtra(MediaPlaybackService.CMDNAME, command);

-							context.startService(i);

-							mLastClickTime = eventtime;

-

-						}

-

-						mLaunched = false;

-						if (buttonId == 0) {

-							mDown = true;

-

-						}

-					}

-				} else {

-					mHandler.removeMessages(MSG_LONGPRESS_TIMEOUT);

-					mDown = false;

-

-				}

-				if (isOrderedBroadcast()) {

-					abortBroadcast();

-

-				}

-			}

-		}

-	}

-}

+/*
+ * Copyright (C) 2007 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.
+ */
+
+package com.android.music;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.os.Handler;
+import android.os.Message;
+import android.view.KeyEvent;
+
+/**
+ * 
+ */
+public class MediaButtonIntentReceiver extends BroadcastReceiver {
+
+	private static final int MSG_LONGPRESS_TIMEOUT = 1;
+
+	private static final int LONG_PRESS_DELAY = 1000;
+
+	private static long mLastClickTime = 0;
+	private static boolean mDown = false;
+	private static boolean mLaunched = false;
+
+	private static Handler mHandler = new Handler() {
+		@Override
+		public void handleMessage(Message msg) {
+			switch (msg.what) {
+			case MSG_LONGPRESS_TIMEOUT:
+				if (!mLaunched) {
+					Context context = (Context) msg.obj;
+					Intent i = new Intent();
+					i.putExtra("autoshuffle", "true");
+					i.setClass(context, MusicBrowserActivity.class);
+					i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+							| Intent.FLAG_ACTIVITY_CLEAR_TOP);
+					context.startActivity(i);
+					mLaunched = true;
+				}
+				break;
+			}
+		}
+	};
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		String intentAction = intent.getAction();
+
+		if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(intentAction)) {
+			Intent i = new Intent(context, MediaPlaybackService.class);
+			i.setAction(MediaPlaybackService.SERVICECMD);
+			i.putExtra(MediaPlaybackService.CMDNAME,
+					MediaPlaybackService.CMDPAUSE);
+			context.startService(i);
+		} else if (Intent.ACTION_MEDIA_BUTTON.equals(intentAction)) {
+			KeyEvent event = (KeyEvent) intent
+					.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+
+			if (event == null) {
+				return;
+			}
+
+			int keycode = event.getKeyCode();
+			int action = event.getAction();
+			long eventtime = event.getEventTime();
+			int buttonId = intent.getIntExtra(MediaPlaybackService.CMDNOTIF, 0);
+
+			// single quick press: pause/resume.
+			// double press: next track
+			// long press: start auto-shuffle mode.
+
+			String command = null;
+			switch (keycode) {
+			case KeyEvent.KEYCODE_MEDIA_STOP:
+				command = MediaPlaybackService.CMDSTOP;
+				break;
+			case KeyEvent.KEYCODE_HEADSETHOOK:
+			case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+				command = MediaPlaybackService.CMDTOGGLEPAUSE;
+
+				break;
+			case KeyEvent.KEYCODE_MEDIA_NEXT:
+				command = MediaPlaybackService.CMDNEXT;
+
+				break;
+			case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+				command = MediaPlaybackService.CMDPREVIOUS;
+
+				break;
+
+			}
+
+			if (command != null) {
+				if (action == KeyEvent.ACTION_DOWN) {
+					if (mDown && (buttonId == 0)) {
+						if ((MediaPlaybackService.CMDTOGGLEPAUSE
+								.equals(command) || MediaPlaybackService.CMDPLAY
+								.equals(command))
+								&& mLastClickTime != 0
+								&& eventtime - mLastClickTime > LONG_PRESS_DELAY) {
+							mHandler.sendMessage(mHandler.obtainMessage(
+									MSG_LONGPRESS_TIMEOUT, context));
+
+						}
+					} else if (event.getRepeatCount() == 0) {
+
+						// only consider the first event in a sequence, not the
+						// repeat events,
+						// so that we don't trigger in cases where the first
+						// event went to
+						// a different app (e.g. when the user ends a phone call
+						// by
+						// long pressing the headset button)
+
+						// The service may or may not be running, but we need to
+						// send it
+
+						// a command.
+						Intent i = new Intent(context,
+								MediaPlaybackService.class);
+
+						i.setAction(MediaPlaybackService.SERVICECMD);
+						if (keycode == KeyEvent.KEYCODE_HEADSETHOOK
+								&& eventtime - mLastClickTime < 300) {
+							i.putExtra(MediaPlaybackService.CMDNAME,
+									MediaPlaybackService.CMDNEXT);
+
+							context.startService(i);
+							mLastClickTime = 0;
+						} else {
+							i.putExtra(MediaPlaybackService.CMDNAME, command);
+							context.startService(i);
+							mLastClickTime = eventtime;
+
+						}
+
+						mLaunched = false;
+						if (buttonId == 0) {
+							mDown = true;
+
+						}
+					}
+				} else {
+					mHandler.removeMessages(MSG_LONGPRESS_TIMEOUT);
+					mDown = false;
+
+				}
+				if (isOrderedBroadcast()) {
+					abortBroadcast();
+
+				}
+			}
+		}
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPickerActivity.java b/src/com/android/music/MediaPickerActivity.java
index 199ec0d..199ec0d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPickerActivity.java
+++ b/src/com/android/music/MediaPickerActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java b/src/com/android/music/MediaPlaybackActivity.java
index 6b50845..6b50845 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 17f2e68..17f2e68 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicAlphabetIndexer.java b/src/com/android/music/MusicAlphabetIndexer.java
index c05f3c1..c05f3c1 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicAlphabetIndexer.java
+++ b/src/com/android/music/MusicAlphabetIndexer.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicBrowserActivity.java b/src/com/android/music/MusicBrowserActivity.java
index 06b6af2..06b6af2 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicBrowserActivity.java
+++ b/src/com/android/music/MusicBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicPicker.java b/src/com/android/music/MusicPicker.java
index 0bc1ff3..0bc1ff3 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicPicker.java
+++ b/src/com/android/music/MusicPicker.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java b/src/com/android/music/MusicSettingsActivity.java
index 4ade0dc..3a6cd7c 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java
+++ b/src/com/android/music/MusicSettingsActivity.java
@@ -1,539 +1,539 @@
-/*

- * Copyright (C) 2011 The CyanogenMod 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.

- */

-

-package com.android.music;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.nio.channels.FileChannel;

-import java.util.List;

-

-import android.app.ActionBar;

-import android.app.AlertDialog;

-import android.app.WallpaperManager;

-import android.content.ActivityNotFoundException;

-import android.content.DialogInterface;

-import android.content.Intent;

-import android.content.SharedPreferences;

-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

-import android.content.pm.PackageInfo;

-import android.content.pm.PackageManager;

-import android.content.pm.PackageManager.NameNotFoundException;

-import android.content.pm.ResolveInfo;

-import android.content.res.Resources;

-import android.graphics.Bitmap;

-import android.graphics.BitmapFactory;

-import android.media.audiofx.AudioEffect;

-import android.net.Uri;

-import android.os.Build;

-import android.os.Bundle;

-import android.os.Environment;

-import android.os.SystemClock;

-import android.preference.CheckBoxPreference;

-import android.preference.ListPreference;

-import android.preference.Preference;

-import android.preference.Preference.OnPreferenceChangeListener;

-import android.preference.Preference.OnPreferenceClickListener;

-import android.preference.PreferenceActivity;

-import android.preference.PreferenceManager;

-import android.preference.PreferenceScreen;

-import android.provider.MediaStore;

-import android.util.Log;

-import android.view.MenuItem;

-import android.view.View;

-import android.widget.ImageView;

-import android.widget.LinearLayout;

-import android.widget.Toast;

-

-public class MusicSettingsActivity extends PreferenceActivity implements

-		OnSharedPreferenceChangeListener, OnPreferenceChangeListener {

-

-	static final String KEY_ENABLE_FOCUS_LOSS_DUCKING = "enable_focus_loss_ducking";

-	static final String KEY_DUCK_ATTENUATION_DB = "duck_attenuation_db";

-	static final String KEY_BACK_BUTTON_DB = "back_button_db";

-	static final String KEY_ANIMATION_UI_DB = "animation_ui_db";

-	static final String KEY_ENABLE_GESTURES = "enable_gestures";

-	static final String KEY_ENABLE_HAPTIC_FEEDBACK = "enable_haptic_feedback";

-	static final String KEY_HAS_CUSTOM_GESTURES = "has_custom_gestures";

-	static final String KEY_ENABLE_SEARCH_BUTTON = "cbSearch";

-	static final String KEY_ENABLE_PLAY_BUTTON = "cbPlay";

-	static final String KEY_ENABLE_NEXT_BUTTON = "cbNext";

-	static final String KEY_ENABLE_PREV_BUTTON = "cbPrev";

-	static final String KEY_ENABLE_NEW_PLAYLIST_BUTTON = "cbPlaylist";

-	static final String KEY_ENABLE_ALBUM_ART = "cbArt";

-	static final String KEY_ENABLE_SONG_TEXT = "tvLine1";

-	static final String KEY_ENABLE_ARTIST_TEXT = "tvLine2";

-	static final String KEY_ENABLE_ALBUM_TEXT = "tvLine3";

-	static final String KEY_COLOR_PREFERENCE_KEY = "color";

-	static final String KEY_ENABLE_STATUS_PLAY_BUTTON = "cbStatusPlay";

-	static final String KEY_ENABLE_SHARE_BUTTON = "cbShare";

-	static final String KEY_ENABLE_PROGRESS_BAR = "cbProgress";

-	static final String KEY_ENABLE_OVER_FLOW = "cbFlow";

-

-	static final String KEY_ENABLE_STATUS_NEXT_BUTTON = "cbStatusNext";

-	static final String KEY_ENABLE_STATUS_PREV_BUTTON = "cbStatusPrev";

-	static final String KEY_ENABLE_STATUS_ALBUM_ART = "cbStatusArt";

-	static final String KEY_ENABLE_STATUS_SONG_TEXT = "tvStatusLine1";

-	static final String KEY_ENABLE_STATUS_ARTIST_TEXT = "tvStatusLine2";

-	static final String KEY_ENABLE_STATUS_ALBUM_TEXT = "tvStatusLine3";

-	static final String KEY_ENABLE_MARKET_SERACH = "cbMarket";

-	static final String KEY_ENABLE_STATUS_COLLAPSE = "cbStatusCollapse";

-	static final String SCREENSAVER_COLOR = "screensaver_color";

-	static final String SCREENSAVER_COLOR_ALPHA = "screensaver_color_alpha";

-	static final String SCREENSAVER_COLOR_RED = "screensaver_color_red";

-	static final String SCREENSAVER_COLOR_GREEN = "screensaver_color_green";

-	static final String SCREENSAVER_COLOR_BLUE = "screensaver_color_blue";

-	static final String KEY_ENTER_FULL_NOW_PLAYING = "cbEnterNowPlaying";

-	static final String KEY_ENABLE_STATUS_TEXT_COLOR = "tvStatusColor";

-	static final String KEY_ENABLE_HOME_ART = "cbHomeAlbumArt";

-	static final String KEY_LOCK = "cbLock";

-	public static final String THEME_DEFAULT = "Music";

-	static final String THEME_KEY = "themePackageName";

-	static final String SHAKE_SENSITIVITY = "shake_sensitivity";

-	static final String FLIP_SENSITIVITY = "flip_sensitivity";

-

-	// This key has the gesture entry name (E.g. PAUSE) appended to it before

-	// use

-	static final String KEY_HAS_CUSTOM_GESTURE_XXX = "has_custom_gesture_";

-

-	static final String DEFAULT_DUCK_ATTENUATION_DB = "8";

-	static final String DEFAULT_BACK_BUTTON_ACTION_DB = "0";

-

-	static final String ACTION_ENABLE_GESTURES_CHANGED = "com.android.music.enablegestureschanged";

-	static final String ACTION_GESTURES_CHANGED = "com.android.music.gestureschanged";

-

-	static final String PREFERENCES_FILE = "settings";

-	public static final String KEY_ENABLE_STATUS_NONYA = "cbStatusNonya";

-	public static final String KEY_BUILD_VERSION = "build";

-	public static final String KEY_SOUND_EFFECT = "eqEffects";

-	public static final String KEY_FEEDBACK = "feedback";

-	public static final String KEY_FLIP = "cbFlip";

-	public static final String KEY_TICK = "cbStatusTicker";

-

-	long[] mHits = new long[3];

-	private static final String LOG_TAG = "EasterEgg";

-	private static final int EFFECTS_PANEL = 0;

-

-	// Color to use for text & graphics in screen saver mode.

-	static final int DEFAULT_SCREENSAVER_COLOR_ALPHA = 230;

-	static final int DEFAULT_SCREENSAVER_COLOR_RED = 0;

-	static final int DEFAULT_SCREENSAVER_COLOR_GREEN = 192;

-	static final int DEFAULT_SCREENSAVER_COLOR_BLUE = 255;

-	// Custom wallpaper

-	static final String BG_PHOTO_FILE = "home_art";

-	static final String TEMP_PHOTO_FILE = "home";

-	private Bitmap bgBitmap = null;

-	// Shake and Flip sensitivity

-	static final double DEFAULT_SHAKE_SENS = 2;

-	static final int DEFAULT_FLIP_SENS = 10;

-

-	public AlertDialog themeAlert;

-	public CheckBoxPreference cp;

-

-	@Override

-	protected void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);

-

-		PreferenceManager preferenceManager = getPreferenceManager();

-		preferenceManager.setSharedPreferencesName(PREFERENCES_FILE);

-		addPreferencesFromResource(R.xml.settings);

-

-		ActionBar bar = getActionBar();

-		bar.setDisplayHomeAsUpEnabled(true);

-

-		PreferenceScreen screen;

-		screen = getPreferenceScreen();

-

-		cp = (CheckBoxPreference) screen.findPreference("cbHomeAlbumArt");

-

-		final CheckBoxPreference lk = (CheckBoxPreference) screen

-				.findPreference("cbLock");

-

-		AlertDialog.Builder builder = new AlertDialog.Builder(this);

-		builder.setTitle("Set Wallpaper");

-		builder.setIcon(android.R.drawable.ic_menu_crop);

-		builder.setMessage(

-				"You should select a wallpaper to use when your music is paused.")

-				.setCancelable(false)

-				.setPositiveButton("Okay",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								pickImage();

-							}

-						})

-				.setNegativeButton("Cancel",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								dialog.cancel();

-								cp.setChecked(false);

-							}

-						});

-		final AlertDialog alert = builder.create();

-

-		AlertDialog.Builder lock = new AlertDialog.Builder(this);

-		lock.setTitle("Requires Restart");

-		lock.setIcon(R.drawable.ic_dialog_alert_holo_dark);

-		lock.setMessage(

-				"Music needs to stop completely and restart to let the changes take effect")

-				.setCancelable(false)

-				.setPositiveButton("Okay",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								// This isn't a good practice, but we need to

-								// restart the

-								// service completely to see the change

-								// immediately

-								System.exit(0);

-							}

-						})

-				.setNegativeButton("Cancel",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								dialog.cancel();

-								if (lk.isChecked()) {

-									lk.setChecked(false);

-								} else {

-									lk.setChecked(true);

-								}

-							}

-						});

-		final AlertDialog lockAlert = lock.create();

-

-		cp.setOnPreferenceClickListener(new OnPreferenceClickListener() {

-			public boolean onPreferenceClick(final Preference preference) {

-				CheckBoxPreference cbp = (CheckBoxPreference) preference;

-				if (cbp.isChecked()) {

-					alert.show();

-				} else {

-					// We don't want the wall paper to remain the album art if

-					// they aren't using this.

-					setCustomBackground();

-				}

-				return true;

-			}

-		});

-

-		lk.setOnPreferenceClickListener(new OnPreferenceClickListener() {

-			public boolean onPreferenceClick(final Preference preference) {

-				lockAlert.show();

-				return true;

-			}

-		});

-

-		try {

-			PackageInfo packageInfo = getPackageManager().getPackageInfo(

-					getPackageName(), 0);

-			findPreference(KEY_BUILD_VERSION).setSummary(

-					Build.VERSION.RELEASE + " - " + packageInfo.versionName);

-		} catch (NameNotFoundException e) {

-			findPreference(KEY_BUILD_VERSION).setSummary("?");

-		}

-		// ADW: theme settings

-		SharedPreferences sp = getPreferenceManager().getSharedPreferences();

-		final String themePackage = sp.getString(THEME_KEY, THEME_DEFAULT);

-		ListPreference themeLp = (ListPreference) findPreference(THEME_KEY);

-		themeLp.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {

-			public boolean onPreferenceChange(Preference preference,

-					Object newValue) {

-				PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");

-				themePreview.setTheme(newValue.toString());

-				return false;

-			}

-		});

-

-		Intent intent = new Intent("com.andrew.music.THEMES");

-		intent.addCategory("android.intent.category.DEFAULT");

-		PackageManager pm = getPackageManager();

-		List<ResolveInfo> themes = pm.queryIntentActivities(intent, 0);

-		String[] entries = new String[themes.size() + 1];

-		String[] values = new String[themes.size() + 1];

-		entries[0] = MusicSettingsActivity.THEME_DEFAULT;

-		values[0] = MusicSettingsActivity.THEME_DEFAULT;

-		for (int i = 0; i < themes.size(); i++) {

-			String appPackageName = (themes.get(i)).activityInfo.packageName

-					.toString();

-			String themeName = (themes.get(i)).loadLabel(pm).toString();

-			entries[i + 1] = themeName;

-			values[i + 1] = appPackageName;

-		}

-		themeLp.setEntries(entries);

-		themeLp.setEntryValues(values);

-		PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");

-		themePreview.setTheme(themePackage);

-	}

-

-	private void pickImage() {

-		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);

-		intent.setType("image/*");

-

-		intent.putExtra("crop", "true");

-		intent.putExtra("scale", true);

-		intent.putExtra("outputFormat", Bitmap.CompressFormat.PNG.toString());

-		intent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());

-		intent.putExtra("noFaceDetection", true);

-

-		startActivityForResult(intent, 0);

-	}

-

-	private Uri getTempUri() {

-		return Uri.fromFile(getTempFile());

-	}

-

-	private File getTempFile() {

-		if (isSDCARDMounted()) {

-

-			File f = new File(Environment.getExternalStorageDirectory(),

-					TEMP_PHOTO_FILE);

-			// try {

-			// f.createNewFile();

-			// } catch (IOException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			// Toast.makeText(this, "Something Fucked Up",

-			// Toast.LENGTH_LONG).show();

-			// }

-			return f;

-		} else {

-			return null;

-		}

-	}

-

-	private boolean isSDCARDMounted() {

-		String status = Environment.getExternalStorageState();

-

-		if (status.equals(Environment.MEDIA_MOUNTED))

-			return true;

-		return false;

-	}

-

-	public static void copyFile(File src, File dst) throws IOException {

-		FileChannel inChannel = new FileInputStream(src).getChannel();

-		FileChannel outChannel = new FileOutputStream(dst).getChannel();

-

-		try {

-			inChannel.transferTo(0, inChannel.size(), outChannel);

-		} finally {

-

-			if (inChannel != null)

-				inChannel.close();

-			if (outChannel != null)

-				outChannel.close();

-		}

-	}

-

-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {

-		if (requestCode == 0) {

-			if (resultCode == RESULT_OK) {

-				try {

-

-					File src = getTempFile();

-					File dst = new File(getFilesDir(), BG_PHOTO_FILE);

-					copyFile(src, dst);

-

-				} catch (FileNotFoundException e) {

-					// TODO Auto-generated catch block

-					e.printStackTrace();

-				} catch (IOException e) {

-					// TODO Auto-generated catch block

-					e.printStackTrace();

-				}

-			}

-		}

-	}

-

-	// Set Custom Background Image

-	public void setCustomBackground() {

-

-		SharedPreferences preferences = getSharedPreferences(

-				MusicSettingsActivity.PREFERENCES_FILE, MODE_PRIVATE);

-

-		preferences

-				.getBoolean(MusicSettingsActivity.KEY_ENABLE_HOME_ART, false);

-

-		// First clean our old data

-		if (bgBitmap != null) {

-			bgBitmap.recycle();

-			bgBitmap = null;

-			System.gc();

-		}

-		// now load the proper bg

-		String BG_FILE = getFilesDir().toString() + File.separator

-				+ MusicSettingsActivity.BG_PHOTO_FILE;

-		bgBitmap = BitmapFactory.decodeFile(BG_FILE);

-

-		try {

-			WallpaperManager.getInstance(this).setBitmap(bgBitmap);

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	}

-

-	public void applyTheme(View v) {

-		PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");

-		String packageName = themePreview.getValue().toString();

-		// this time we really save the themepackagename

-		SharedPreferences sp = getPreferenceManager().getSharedPreferences();

-		final SharedPreferences.Editor editor = sp.edit();

-		editor.putString("themePackageName", packageName);

-		// and update the preferences from the theme

-		// TODO:ADW maybe this should be optional for the user

-		if (!packageName.equals(MusicSettingsActivity.THEME_DEFAULT)) {

-			Resources themeResources = null;

-			try {

-				themeResources = getPackageManager()

-						.getResourcesForApplication(packageName.toString());

-			} catch (NameNotFoundException e) {

-				// e.printStackTrace();

-			}

-		} else {

-

-		}

-		AlertDialog.Builder theme = new AlertDialog.Builder(this);

-		theme.setTitle("Requires Restart");

-		theme.setIcon(R.drawable.ic_dialog_alert_holo_dark);

-		theme.setMessage(

-				"Music needs to stop completely and restart to let the changes take effect")

-				.setCancelable(false)

-				.setPositiveButton("Okay",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								editor.commit();

-								// This isn't a good practice, but we need to

-								// restart the

-								// service completely to see the change

-								// immediately

-								System.exit(0);

-							}

-						})

-				.setNegativeButton("Cancel",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-								dialog.cancel();

-							}

-						});

-		themeAlert = theme.create();

-		themeAlert.show();

-	}

-

-	public void getThemes(View v) {

-		// TODO:warn theme devs to use "MusicTheme" as keyword.

-		Uri marketUri = Uri.parse("market://search?q=MusicTheme");

-		Intent marketIntent = new Intent(Intent.ACTION_VIEW).setData(marketUri);

-		try {

-			startActivity(marketIntent);

-		} catch (ActivityNotFoundException e) {

-			Toast.makeText(this, R.string.activity_not_found,

-					Toast.LENGTH_SHORT).show();

-		} catch (SecurityException e) {

-			Toast.makeText(this, R.string.activity_not_found,

-					Toast.LENGTH_SHORT).show();

-			Log.e("Music", "Get themes", e);

-		}

-		finish();

-	}

-

-	@Override

-	public boolean onOptionsItemSelected(MenuItem item) {

-		switch (item.getItemId()) {

-		case android.R.id.home:

-			super.onBackPressed();

-			break;

-		}

-		return super.onOptionsItemSelected(item);

-	}

-

-	@Override

-	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,

-			String key) {

-		if (key.equals(KEY_ENABLE_GESTURES)) {

-			Intent intent = new Intent(ACTION_ENABLE_GESTURES_CHANGED);

-			sendBroadcast(intent);

-		}

-	}

-

-	@Override

-	protected void onResume() {

-		super.onResume();

-		getPreferenceScreen().getSharedPreferences()

-				.registerOnSharedPreferenceChangeListener(this);

-	}

-

-	@Override

-	protected void onPause() {

-		super.onPause();

-		getPreferenceScreen().getSharedPreferences()

-				.unregisterOnSharedPreferenceChangeListener(this);

-	}

-

-	@Override

-	protected void onDestroy() {

-		super.onDestroy();

-

-	}

-

-	@Override

-	public boolean onPreferenceChange(Preference arg0, Object arg1) {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,

-			Preference preference) {

-		try {

-			if (preference.getKey().equals(KEY_BUILD_VERSION)) {

-				System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);

-				mHits[mHits.length - 1] = SystemClock.uptimeMillis();

-				if (mHits[0] >= (SystemClock.uptimeMillis() - 500)) {

-					Toast ImageToast = new Toast(getBaseContext());

-					LinearLayout toastLayout = new LinearLayout(

-							getBaseContext());

-					toastLayout.setOrientation(LinearLayout.HORIZONTAL);

-					ImageView image = new ImageView(getBaseContext());

-					image.setImageResource(R.drawable.easter_egg);

-					toastLayout.addView(image);

-					ImageToast.setView(toastLayout);

-					ImageToast.setDuration(Toast.LENGTH_SHORT);

-					ImageToast.show();

-				}

-			}

-		} catch (NullPointerException ee) {

-

-		}

-		try {

-			if (preference.getKey().equals(KEY_SOUND_EFFECT)) {

-				Intent i = new Intent(

-						AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL);

-				try {

-					i.putExtra(AudioEffect.EXTRA_AUDIO_SESSION,

-							MusicUtils.sService.getAudioSessionId());

-				} catch (Exception e) {

-					// TODO Auto-generated catch block

-					e.printStackTrace();

-				}

-				startActivityForResult(i, EFFECTS_PANEL);

-			}

-		} catch (NullPointerException ee) {

-

-		}

-

-		return super.onPreferenceTreeClick(preferenceScreen, preference);

-	}

-}

+/*
+ * Copyright (C) 2011 The CyanogenMod 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.
+ */
+
+package com.android.music;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.util.List;
+
+import android.app.ActionBar;
+import android.app.AlertDialog;
+import android.app.WallpaperManager;
+import android.content.ActivityNotFoundException;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.audiofx.AudioEffect;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.SystemClock;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+public class MusicSettingsActivity extends PreferenceActivity implements
+		OnSharedPreferenceChangeListener, OnPreferenceChangeListener {
+
+	static final String KEY_ENABLE_FOCUS_LOSS_DUCKING = "enable_focus_loss_ducking";
+	static final String KEY_DUCK_ATTENUATION_DB = "duck_attenuation_db";
+	static final String KEY_BACK_BUTTON_DB = "back_button_db";
+	static final String KEY_ANIMATION_UI_DB = "animation_ui_db";
+	static final String KEY_ENABLE_GESTURES = "enable_gestures";
+	static final String KEY_ENABLE_HAPTIC_FEEDBACK = "enable_haptic_feedback";
+	static final String KEY_HAS_CUSTOM_GESTURES = "has_custom_gestures";
+	static final String KEY_ENABLE_SEARCH_BUTTON = "cbSearch";
+	static final String KEY_ENABLE_PLAY_BUTTON = "cbPlay";
+	static final String KEY_ENABLE_NEXT_BUTTON = "cbNext";
+	static final String KEY_ENABLE_PREV_BUTTON = "cbPrev";
+	static final String KEY_ENABLE_NEW_PLAYLIST_BUTTON = "cbPlaylist";
+	static final String KEY_ENABLE_ALBUM_ART = "cbArt";
+	static final String KEY_ENABLE_SONG_TEXT = "tvLine1";
+	static final String KEY_ENABLE_ARTIST_TEXT = "tvLine2";
+	static final String KEY_ENABLE_ALBUM_TEXT = "tvLine3";
+	static final String KEY_COLOR_PREFERENCE_KEY = "color";
+	static final String KEY_ENABLE_STATUS_PLAY_BUTTON = "cbStatusPlay";
+	static final String KEY_ENABLE_SHARE_BUTTON = "cbShare";
+	static final String KEY_ENABLE_PROGRESS_BAR = "cbProgress";
+	static final String KEY_ENABLE_OVER_FLOW = "cbFlow";
+
+	static final String KEY_ENABLE_STATUS_NEXT_BUTTON = "cbStatusNext";
+	static final String KEY_ENABLE_STATUS_PREV_BUTTON = "cbStatusPrev";
+	static final String KEY_ENABLE_STATUS_ALBUM_ART = "cbStatusArt";
+	static final String KEY_ENABLE_STATUS_SONG_TEXT = "tvStatusLine1";
+	static final String KEY_ENABLE_STATUS_ARTIST_TEXT = "tvStatusLine2";
+	static final String KEY_ENABLE_STATUS_ALBUM_TEXT = "tvStatusLine3";
+	static final String KEY_ENABLE_MARKET_SERACH = "cbMarket";
+	static final String KEY_ENABLE_STATUS_COLLAPSE = "cbStatusCollapse";
+	static final String SCREENSAVER_COLOR = "screensaver_color";
+	static final String SCREENSAVER_COLOR_ALPHA = "screensaver_color_alpha";
+	static final String SCREENSAVER_COLOR_RED = "screensaver_color_red";
+	static final String SCREENSAVER_COLOR_GREEN = "screensaver_color_green";
+	static final String SCREENSAVER_COLOR_BLUE = "screensaver_color_blue";
+	static final String KEY_ENTER_FULL_NOW_PLAYING = "cbEnterNowPlaying";
+	static final String KEY_ENABLE_STATUS_TEXT_COLOR = "tvStatusColor";
+	static final String KEY_ENABLE_HOME_ART = "cbHomeAlbumArt";
+	static final String KEY_LOCK = "cbLock";
+	public static final String THEME_DEFAULT = "Music";
+	static final String THEME_KEY = "themePackageName";
+	static final String SHAKE_SENSITIVITY = "shake_sensitivity";
+	static final String FLIP_SENSITIVITY = "flip_sensitivity";
+
+	// This key has the gesture entry name (E.g. PAUSE) appended to it before
+	// use
+	static final String KEY_HAS_CUSTOM_GESTURE_XXX = "has_custom_gesture_";
+
+	static final String DEFAULT_DUCK_ATTENUATION_DB = "8";
+	static final String DEFAULT_BACK_BUTTON_ACTION_DB = "0";
+
+	static final String ACTION_ENABLE_GESTURES_CHANGED = "com.android.music.enablegestureschanged";
+	static final String ACTION_GESTURES_CHANGED = "com.android.music.gestureschanged";
+
+	static final String PREFERENCES_FILE = "settings";
+	public static final String KEY_ENABLE_STATUS_NONYA = "cbStatusNonya";
+	public static final String KEY_BUILD_VERSION = "build";
+	public static final String KEY_SOUND_EFFECT = "eqEffects";
+	public static final String KEY_FEEDBACK = "feedback";
+	public static final String KEY_FLIP = "cbFlip";
+	public static final String KEY_TICK = "cbStatusTicker";
+
+	long[] mHits = new long[3];
+	private static final String LOG_TAG = "EasterEgg";
+	private static final int EFFECTS_PANEL = 0;
+
+	// Color to use for text & graphics in screen saver mode.
+	static final int DEFAULT_SCREENSAVER_COLOR_ALPHA = 230;
+	static final int DEFAULT_SCREENSAVER_COLOR_RED = 0;
+	static final int DEFAULT_SCREENSAVER_COLOR_GREEN = 192;
+	static final int DEFAULT_SCREENSAVER_COLOR_BLUE = 255;
+	// Custom wallpaper
+	static final String BG_PHOTO_FILE = "home_art";
+	static final String TEMP_PHOTO_FILE = "home";
+	private Bitmap bgBitmap = null;
+	// Shake and Flip sensitivity
+	static final double DEFAULT_SHAKE_SENS = 2;
+	static final int DEFAULT_FLIP_SENS = 10;
+
+	public AlertDialog themeAlert;
+	public CheckBoxPreference cp;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		PreferenceManager preferenceManager = getPreferenceManager();
+		preferenceManager.setSharedPreferencesName(PREFERENCES_FILE);
+		addPreferencesFromResource(R.xml.settings);
+
+		ActionBar bar = getActionBar();
+		bar.setDisplayHomeAsUpEnabled(true);
+
+		PreferenceScreen screen;
+		screen = getPreferenceScreen();
+
+		cp = (CheckBoxPreference) screen.findPreference("cbHomeAlbumArt");
+
+		final CheckBoxPreference lk = (CheckBoxPreference) screen
+				.findPreference("cbLock");
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle("Set Wallpaper");
+		builder.setIcon(android.R.drawable.ic_menu_crop);
+		builder.setMessage(
+				"You should select a wallpaper to use when your music is paused.")
+				.setCancelable(false)
+				.setPositiveButton("Okay",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								pickImage();
+							}
+						})
+				.setNegativeButton("Cancel",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								dialog.cancel();
+								cp.setChecked(false);
+							}
+						});
+		final AlertDialog alert = builder.create();
+
+		AlertDialog.Builder lock = new AlertDialog.Builder(this);
+		lock.setTitle("Requires Restart");
+		lock.setIcon(R.drawable.ic_dialog_alert_holo_dark);
+		lock.setMessage(
+				"Music needs to stop completely and restart to let the changes take effect")
+				.setCancelable(false)
+				.setPositiveButton("Okay",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								// This isn't a good practice, but we need to
+								// restart the
+								// service completely to see the change
+								// immediately
+								System.exit(0);
+							}
+						})
+				.setNegativeButton("Cancel",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								dialog.cancel();
+								if (lk.isChecked()) {
+									lk.setChecked(false);
+								} else {
+									lk.setChecked(true);
+								}
+							}
+						});
+		final AlertDialog lockAlert = lock.create();
+
+		cp.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+			public boolean onPreferenceClick(final Preference preference) {
+				CheckBoxPreference cbp = (CheckBoxPreference) preference;
+				if (cbp.isChecked()) {
+					alert.show();
+				} else {
+					// We don't want the wall paper to remain the album art if
+					// they aren't using this.
+					setCustomBackground();
+				}
+				return true;
+			}
+		});
+
+		lk.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+			public boolean onPreferenceClick(final Preference preference) {
+				lockAlert.show();
+				return true;
+			}
+		});
+
+		try {
+			PackageInfo packageInfo = getPackageManager().getPackageInfo(
+					getPackageName(), 0);
+			findPreference(KEY_BUILD_VERSION).setSummary(
+					Build.VERSION.RELEASE + " - " + packageInfo.versionName);
+		} catch (NameNotFoundException e) {
+			findPreference(KEY_BUILD_VERSION).setSummary("?");
+		}
+		// ADW: theme settings
+		SharedPreferences sp = getPreferenceManager().getSharedPreferences();
+		final String themePackage = sp.getString(THEME_KEY, THEME_DEFAULT);
+		ListPreference themeLp = (ListPreference) findPreference(THEME_KEY);
+		themeLp.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			public boolean onPreferenceChange(Preference preference,
+					Object newValue) {
+				PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");
+				themePreview.setTheme(newValue.toString());
+				return false;
+			}
+		});
+
+		Intent intent = new Intent("com.andrew.music.THEMES");
+		intent.addCategory("android.intent.category.DEFAULT");
+		PackageManager pm = getPackageManager();
+		List<ResolveInfo> themes = pm.queryIntentActivities(intent, 0);
+		String[] entries = new String[themes.size() + 1];
+		String[] values = new String[themes.size() + 1];
+		entries[0] = MusicSettingsActivity.THEME_DEFAULT;
+		values[0] = MusicSettingsActivity.THEME_DEFAULT;
+		for (int i = 0; i < themes.size(); i++) {
+			String appPackageName = (themes.get(i)).activityInfo.packageName
+					.toString();
+			String themeName = (themes.get(i)).loadLabel(pm).toString();
+			entries[i + 1] = themeName;
+			values[i + 1] = appPackageName;
+		}
+		themeLp.setEntries(entries);
+		themeLp.setEntryValues(values);
+		PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");
+		themePreview.setTheme(themePackage);
+	}
+
+	private void pickImage() {
+		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+		intent.setType("image/*");
+
+		intent.putExtra("crop", "true");
+		intent.putExtra("scale", true);
+		intent.putExtra("outputFormat", Bitmap.CompressFormat.PNG.toString());
+		intent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());
+		intent.putExtra("noFaceDetection", true);
+
+		startActivityForResult(intent, 0);
+	}
+
+	private Uri getTempUri() {
+		return Uri.fromFile(getTempFile());
+	}
+
+	private File getTempFile() {
+		if (isSDCARDMounted()) {
+
+			File f = new File(Environment.getExternalStorageDirectory(),
+					TEMP_PHOTO_FILE);
+			// try {
+			// f.createNewFile();
+			// } catch (IOException e) {
+			// TODO Auto-generated catch block
+			// e.printStackTrace();
+			// Toast.makeText(this, "Something Fucked Up",
+			// Toast.LENGTH_LONG).show();
+			// }
+			return f;
+		} else {
+			return null;
+		}
+	}
+
+	private boolean isSDCARDMounted() {
+		String status = Environment.getExternalStorageState();
+
+		if (status.equals(Environment.MEDIA_MOUNTED))
+			return true;
+		return false;
+	}
+
+	public static void copyFile(File src, File dst) throws IOException {
+		FileChannel inChannel = new FileInputStream(src).getChannel();
+		FileChannel outChannel = new FileOutputStream(dst).getChannel();
+
+		try {
+			inChannel.transferTo(0, inChannel.size(), outChannel);
+		} finally {
+
+			if (inChannel != null)
+				inChannel.close();
+			if (outChannel != null)
+				outChannel.close();
+		}
+	}
+
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (requestCode == 0) {
+			if (resultCode == RESULT_OK) {
+				try {
+
+					File src = getTempFile();
+					File dst = new File(getFilesDir(), BG_PHOTO_FILE);
+					copyFile(src, dst);
+
+				} catch (FileNotFoundException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	// Set Custom Background Image
+	public void setCustomBackground() {
+
+		SharedPreferences preferences = getSharedPreferences(
+				MusicSettingsActivity.PREFERENCES_FILE, MODE_PRIVATE);
+
+		preferences
+				.getBoolean(MusicSettingsActivity.KEY_ENABLE_HOME_ART, false);
+
+		// First clean our old data
+		if (bgBitmap != null) {
+			bgBitmap.recycle();
+			bgBitmap = null;
+			System.gc();
+		}
+		// now load the proper bg
+		String BG_FILE = getFilesDir().toString() + File.separator
+				+ MusicSettingsActivity.BG_PHOTO_FILE;
+		bgBitmap = BitmapFactory.decodeFile(BG_FILE);
+
+		try {
+			WallpaperManager.getInstance(this).setBitmap(bgBitmap);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	public void applyTheme(View v) {
+		PreviewPreference themePreview = (PreviewPreference) findPreference("themePreview");
+		String packageName = themePreview.getValue().toString();
+		// this time we really save the themepackagename
+		SharedPreferences sp = getPreferenceManager().getSharedPreferences();
+		final SharedPreferences.Editor editor = sp.edit();
+		editor.putString("themePackageName", packageName);
+		// and update the preferences from the theme
+		// TODO:ADW maybe this should be optional for the user
+		if (!packageName.equals(MusicSettingsActivity.THEME_DEFAULT)) {
+			Resources themeResources = null;
+			try {
+				themeResources = getPackageManager()
+						.getResourcesForApplication(packageName.toString());
+			} catch (NameNotFoundException e) {
+				// e.printStackTrace();
+			}
+		} else {
+
+		}
+		AlertDialog.Builder theme = new AlertDialog.Builder(this);
+		theme.setTitle("Requires Restart");
+		theme.setIcon(R.drawable.ic_dialog_alert_holo_dark);
+		theme.setMessage(
+				"Music needs to stop completely and restart to let the changes take effect")
+				.setCancelable(false)
+				.setPositiveButton("Okay",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								editor.commit();
+								// This isn't a good practice, but we need to
+								// restart the
+								// service completely to see the change
+								// immediately
+								System.exit(0);
+							}
+						})
+				.setNegativeButton("Cancel",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+								dialog.cancel();
+							}
+						});
+		themeAlert = theme.create();
+		themeAlert.show();
+	}
+
+	public void getThemes(View v) {
+		// TODO:warn theme devs to use "MusicTheme" as keyword.
+		Uri marketUri = Uri.parse("market://search?q=MusicTheme");
+		Intent marketIntent = new Intent(Intent.ACTION_VIEW).setData(marketUri);
+		try {
+			startActivity(marketIntent);
+		} catch (ActivityNotFoundException e) {
+			Toast.makeText(this, R.string.activity_not_found,
+					Toast.LENGTH_SHORT).show();
+		} catch (SecurityException e) {
+			Toast.makeText(this, R.string.activity_not_found,
+					Toast.LENGTH_SHORT).show();
+			Log.e("Music", "Get themes", e);
+		}
+		finish();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case android.R.id.home:
+			super.onBackPressed();
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+			String key) {
+		if (key.equals(KEY_ENABLE_GESTURES)) {
+			Intent intent = new Intent(ACTION_ENABLE_GESTURES_CHANGED);
+			sendBroadcast(intent);
+		}
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		getPreferenceScreen().getSharedPreferences()
+				.registerOnSharedPreferenceChangeListener(this);
+	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		getPreferenceScreen().getSharedPreferences()
+				.unregisterOnSharedPreferenceChangeListener(this);
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+
+	}
+
+	@Override
+	public boolean onPreferenceChange(Preference arg0, Object arg1) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+			Preference preference) {
+		try {
+			if (preference.getKey().equals(KEY_BUILD_VERSION)) {
+				System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
+				mHits[mHits.length - 1] = SystemClock.uptimeMillis();
+				if (mHits[0] >= (SystemClock.uptimeMillis() - 500)) {
+					Toast ImageToast = new Toast(getBaseContext());
+					LinearLayout toastLayout = new LinearLayout(
+							getBaseContext());
+					toastLayout.setOrientation(LinearLayout.HORIZONTAL);
+					ImageView image = new ImageView(getBaseContext());
+					image.setImageResource(R.drawable.easter_egg);
+					toastLayout.addView(image);
+					ImageToast.setView(toastLayout);
+					ImageToast.setDuration(Toast.LENGTH_SHORT);
+					ImageToast.show();
+				}
+			}
+		} catch (NullPointerException ee) {
+
+		}
+		try {
+			if (preference.getKey().equals(KEY_SOUND_EFFECT)) {
+				Intent i = new Intent(
+						AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL);
+				try {
+					i.putExtra(AudioEffect.EXTRA_AUDIO_SESSION,
+							MusicUtils.sService.getAudioSessionId());
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				startActivityForResult(i, EFFECTS_PANEL);
+			}
+		} catch (NullPointerException ee) {
+
+		}
+
+		return super.onPreferenceTreeClick(preferenceScreen, preference);
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index 2e4e8d7..2e4e8d7 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicViewPager.java b/src/com/android/music/MusicViewPager.java
index e8895aa..2ad1424 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicViewPager.java
+++ b/src/com/android/music/MusicViewPager.java
@@ -1,40 +1,40 @@
-/*

- * 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.

- */

-

-package com.android.music;

-

-import android.content.Context;

-import android.support.v4.view.ViewPager;

-import android.util.AttributeSet;

-

-public class MusicViewPager extends ViewPager {

-	public MusicViewPager(Context context) {

-		super(context);

-	}

-

-	public MusicViewPager(Context context, AttributeSet attrs) {

-		super(context, attrs);

-	}

-

-	/**

-	 * ViewPager inherits ViewGroup's default behavior of delayed clicks on its

-	 * children, but in order to make the calc buttons more responsive we

-	 * disable that here.

-	 */

-	public boolean shouldDelayChildPressedState() {

-		return false;

-	}

-}

+/*
+ * 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.
+ */
+
+package com.android.music;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+
+public class MusicViewPager extends ViewPager {
+	public MusicViewPager(Context context) {
+		super(context);
+	}
+
+	public MusicViewPager(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	/**
+	 * ViewPager inherits ViewGroup's default behavior of delayed clicks on its
+	 * children, but in order to make the calc buttons more responsive we
+	 * disable that here.
+	 */
+	public boolean shouldDelayChildPressedState() {
+		return false;
+	}
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index 6764f8f..6764f8f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java b/src/com/android/music/PreviewPreference.java
index 6ede95d..6ede95d 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java
+++ b/src/com/android/music/PreviewPreference.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/QueryBrowserActivity.java b/src/com/android/music/QueryBrowserActivity.java
index 24a3394..24a3394 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/QueryBrowserActivity.java
+++ b/src/com/android/music/QueryBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/RenamePlaylist.java b/src/com/android/music/RenamePlaylist.java
index 261b34f..261b34f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/RenamePlaylist.java
+++ b/src/com/android/music/RenamePlaylist.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/RepeatingImageButton.java b/src/com/android/music/RepeatingImageButton.java
index b4e7733..b4e7733 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/RepeatingImageButton.java
+++ b/src/com/android/music/RepeatingImageButton.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ScanningProgress.java b/src/com/android/music/ScanningProgress.java
index 3d5f926..3d5f926 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ScanningProgress.java
+++ b/src/com/android/music/ScanningProgress.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/Sensitivity.java b/src/com/android/music/Sensitivity.java
index eca85af..8113fc6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/Sensitivity.java
+++ b/src/com/android/music/Sensitivity.java
@@ -1,113 +1,113 @@
-package com.android.music;

-

-import android.app.Activity;

-import android.app.AlertDialog;

-import android.content.DialogInterface;

-import android.content.SharedPreferences;

-import android.os.Bundle;

-import android.preference.PreferenceManager;

-import android.widget.ImageView;

-import android.widget.SeekBar;

-import android.widget.TextView;

-

-public class Sensitivity extends Activity implements

-		SeekBar.OnSeekBarChangeListener {

-

-	private int shakeChange;

-	private int flipChange;

-	private int bool;

-

-	SeekBar shake;

-	SeekBar flip;

-	TextView mProgressText;

-	ImageView mFlip;

-	ImageView mShake;

-

-	SharedPreferences mPrefs;

-

-	AlertDialog alert;

-

-	@Override

-	protected void onCreate(Bundle savedInstanceState) {

-		// TODO Auto-generated method stub

-		super.onCreate(savedInstanceState);

-		setContentView(R.layout.sensitive);

-

-		mPrefs = PreferenceManager.getDefaultSharedPreferences(this);

-		loadPreferences();

-

-		shake = (SeekBar) findViewById(R.id.shake_sens);

-		flip = (SeekBar) findViewById(R.id.flip_sens);

-		mShake = (ImageView) findViewById(R.id.iv_shake_sens);

-		mFlip = (ImageView) findViewById(R.id.iv_flip_sens);

-

-		mShake.setImageResource(R.drawable.ic_shake);

-		mFlip.setImageResource(R.drawable.ic_flip);

-

-		shake.setOnSeekBarChangeListener(this);

-		flip.setOnSeekBarChangeListener(this);

-		shake.setProgress(shakeChange);

-		flip.setProgress(flipChange);

-

-		AlertDialog.Builder builder = new AlertDialog.Builder(this);

-		builder.setTitle("Restart Required");

-		builder.setIcon(R.drawable.ic_dialog_alert_holo_dark);

-		builder.setMessage(

-				"Music will restart after you make your changes to use them immeditately.")

-				.setCancelable(false)

-				.setPositiveButton("Okay",

-						new DialogInterface.OnClickListener() {

-							public void onClick(DialogInterface dialog, int id) {

-

-							}

-						});

-		alert = builder.create();

-		alert.show();

-	}

-

-	@Override

-	public void onStop() {

-		super.onStop();

-		saveSens();

-		System.exit(0);

-

-	}

-

-	private void saveSens() {

-		SharedPreferences.Editor editor = mPrefs.edit();

-		editor.putInt(MusicSettingsActivity.SHAKE_SENSITIVITY, shakeChange);

-		editor.putInt(MusicSettingsActivity.FLIP_SENSITIVITY, flipChange);

-		editor.commit();

-	}

-

-	private void loadPreferences() {

-		shakeChange = new Integer(mPrefs.getInt(

-				MusicSettingsActivity.SHAKE_SENSITIVITY,

-				(int) (MusicSettingsActivity.DEFAULT_SHAKE_SENS)));

-		flipChange = new Integer(mPrefs.getInt(

-				MusicSettingsActivity.FLIP_SENSITIVITY,

-				MusicSettingsActivity.DEFAULT_FLIP_SENS));

-	}

-

-	public void onProgressChanged(SeekBar seekBar, int progress,

-			boolean fromUser) {

-		if (seekBar == shake)

-			shakeChange = progress;

-		else if (seekBar == flip)

-			flipChange = progress;

-

-	}

-

-	@Override

-	public void onStartTrackingTouch(SeekBar seekBar) {

-		// TODO Auto-generated method stub

-

-	}

-

-	@Override

-	public void onStopTrackingTouch(SeekBar seekBar) {

-		// TODO Auto-generated method stub

-

-	}

-

-}

+package com.android.music;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.widget.ImageView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+public class Sensitivity extends Activity implements
+		SeekBar.OnSeekBarChangeListener {
+
+	private int shakeChange;
+	private int flipChange;
+	private int bool;
+
+	SeekBar shake;
+	SeekBar flip;
+	TextView mProgressText;
+	ImageView mFlip;
+	ImageView mShake;
+
+	SharedPreferences mPrefs;
+
+	AlertDialog alert;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.sensitive);
+
+		mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+		loadPreferences();
+
+		shake = (SeekBar) findViewById(R.id.shake_sens);
+		flip = (SeekBar) findViewById(R.id.flip_sens);
+		mShake = (ImageView) findViewById(R.id.iv_shake_sens);
+		mFlip = (ImageView) findViewById(R.id.iv_flip_sens);
+
+		mShake.setImageResource(R.drawable.ic_shake);
+		mFlip.setImageResource(R.drawable.ic_flip);
+
+		shake.setOnSeekBarChangeListener(this);
+		flip.setOnSeekBarChangeListener(this);
+		shake.setProgress(shakeChange);
+		flip.setProgress(flipChange);
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle("Restart Required");
+		builder.setIcon(R.drawable.ic_dialog_alert_holo_dark);
+		builder.setMessage(
+				"Music will restart after you make your changes to use them immeditately.")
+				.setCancelable(false)
+				.setPositiveButton("Okay",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int id) {
+
+							}
+						});
+		alert = builder.create();
+		alert.show();
+	}
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		saveSens();
+		System.exit(0);
+
+	}
+
+	private void saveSens() {
+		SharedPreferences.Editor editor = mPrefs.edit();
+		editor.putInt(MusicSettingsActivity.SHAKE_SENSITIVITY, shakeChange);
+		editor.putInt(MusicSettingsActivity.FLIP_SENSITIVITY, flipChange);
+		editor.commit();
+	}
+
+	private void loadPreferences() {
+		shakeChange = new Integer(mPrefs.getInt(
+				MusicSettingsActivity.SHAKE_SENSITIVITY,
+				(int) (MusicSettingsActivity.DEFAULT_SHAKE_SENS)));
+		flipChange = new Integer(mPrefs.getInt(
+				MusicSettingsActivity.FLIP_SENSITIVITY,
+				MusicSettingsActivity.DEFAULT_FLIP_SENS));
+	}
+
+	public void onProgressChanged(SeekBar seekBar, int progress,
+			boolean fromUser) {
+		if (seekBar == shake)
+			shakeChange = progress;
+		else if (seekBar == flip)
+			flipChange = progress;
+
+	}
+
+	@Override
+	public void onStartTrackingTouch(SeekBar seekBar) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void onStopTrackingTouch(SeekBar seekBar) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/Shaker.java b/src/com/android/music/Shaker.java
index 0d59073..de72fcd 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/Shaker.java
+++ b/src/com/android/music/Shaker.java
@@ -1,89 +1,89 @@
-package com.android.music;

-

-import android.content.Context;

-import android.hardware.Sensor;

-import android.hardware.SensorEvent;

-import android.hardware.SensorEventListener;

-import android.hardware.SensorManager;

-import android.os.SystemClock;

-import com.android.music.R;

-

-public class Shaker {

-	private SensorManager mgr = null;

-	private long lastShakeTimestamp = 0;

-	private double threshold = 1.0d;

-	private long gap = 0;

-	private Shaker.Callback cb = null;

-

-	public Shaker(Context ctxt, double threshold, long gap, Shaker.Callback cb) {

-		this.threshold = threshold * threshold;

-		this.threshold = this.threshold * SensorManager.GRAVITY_EARTH

-				* SensorManager.GRAVITY_EARTH;

-		this.gap = gap;

-		this.cb = cb;

-

-		mgr = (SensorManager) ctxt.getSystemService(Context.SENSOR_SERVICE);

-		mgr.registerListener(listener,

-				mgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),

-				SensorManager.SENSOR_DELAY_UI);

-	}

-

-	public void close() {

-		mgr.unregisterListener(listener);

-	}

-

-	private void isShaking() {

-		long now = SystemClock.uptimeMillis();

-

-		if (lastShakeTimestamp == 0) {

-			lastShakeTimestamp = now;

-

-			if (cb != null) {

-				cb.shakingStarted();

-			}

-		} else {

-			lastShakeTimestamp = now;

-		}

-	}

-

-	private void isNotShaking() {

-		long now = SystemClock.uptimeMillis();

-

-		if (lastShakeTimestamp > 0) {

-			if (now - lastShakeTimestamp > gap) {

-				lastShakeTimestamp = 0;

-

-				if (cb != null) {

-					cb.shakingStopped();

-				}

-			}

-		}

-	}

-

-	public interface Callback {

-		void shakingStarted();

-

-		void shakingStopped();

-	}

-

-	private SensorEventListener listener = new SensorEventListener() {

-		public void onSensorChanged(SensorEvent e) {

-			if (e.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {

-				double netForce = e.values[0] * e.values[0];

-

-				netForce += e.values[1] * e.values[1];

-				netForce += e.values[2] * e.values[2];

-

-				if (threshold < netForce) {

-					isShaking();

-				} else {

-					isNotShaking();

-				}

-			}

-		}

-

-		public void onAccuracyChanged(Sensor sensor, int accuracy) {

-			// unused

-		}

-	};

+package com.android.music;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.SystemClock;
+import com.android.music.R;
+
+public class Shaker {
+	private SensorManager mgr = null;
+	private long lastShakeTimestamp = 0;
+	private double threshold = 1.0d;
+	private long gap = 0;
+	private Shaker.Callback cb = null;
+
+	public Shaker(Context ctxt, double threshold, long gap, Shaker.Callback cb) {
+		this.threshold = threshold * threshold;
+		this.threshold = this.threshold * SensorManager.GRAVITY_EARTH
+				* SensorManager.GRAVITY_EARTH;
+		this.gap = gap;
+		this.cb = cb;
+
+		mgr = (SensorManager) ctxt.getSystemService(Context.SENSOR_SERVICE);
+		mgr.registerListener(listener,
+				mgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+				SensorManager.SENSOR_DELAY_UI);
+	}
+
+	public void close() {
+		mgr.unregisterListener(listener);
+	}
+
+	private void isShaking() {
+		long now = SystemClock.uptimeMillis();
+
+		if (lastShakeTimestamp == 0) {
+			lastShakeTimestamp = now;
+
+			if (cb != null) {
+				cb.shakingStarted();
+			}
+		} else {
+			lastShakeTimestamp = now;
+		}
+	}
+
+	private void isNotShaking() {
+		long now = SystemClock.uptimeMillis();
+
+		if (lastShakeTimestamp > 0) {
+			if (now - lastShakeTimestamp > gap) {
+				lastShakeTimestamp = 0;
+
+				if (cb != null) {
+					cb.shakingStopped();
+				}
+			}
+		}
+	}
+
+	public interface Callback {
+		void shakingStarted();
+
+		void shakingStopped();
+	}
+
+	private SensorEventListener listener = new SensorEventListener() {
+		public void onSensorChanged(SensorEvent e) {
+			if (e.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+				double netForce = e.values[0] * e.values[0];
+
+				netForce += e.values[1] * e.values[1];
+				netForce += e.values[2] * e.values[2];
+
+				if (threshold < netForce) {
+					isShaking();
+				} else {
+					isNotShaking();
+				}
+			}
+		}
+
+		public void onAccuracyChanged(Sensor sensor, int accuracy) {
+			// unused
+		}
+	};
 }
\ No newline at end of file
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/SharedPreferencesCompat.java b/src/com/android/music/SharedPreferencesCompat.java
index 92780a6..92780a6 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/SharedPreferencesCompat.java
+++ b/src/com/android/music/SharedPreferencesCompat.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/SortCursor.java b/src/com/android/music/SortCursor.java
index 7482a3f..7482a3f 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/SortCursor.java
+++ b/src/com/android/music/SortCursor.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TouchInterceptor.java b/src/com/android/music/TouchInterceptor.java
index 90b208a..90b208a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TouchInterceptor.java
+++ b/src/com/android/music/TouchInterceptor.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 8354487..8354487 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/VerticalTextSpinner.java b/src/com/android/music/VerticalTextSpinner.java
index e599eeb..e599eeb 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/VerticalTextSpinner.java
+++ b/src/com/android/music/VerticalTextSpinner.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/VideoBrowserActivity.java b/src/com/android/music/VideoBrowserActivity.java
index ee062f0..ee062f0 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/VideoBrowserActivity.java
+++ b/src/com/android/music/VideoBrowserActivity.java
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/WeekSelector.java b/src/com/android/music/WeekSelector.java
index 3288c8a..3288c8a 100644
--- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/WeekSelector.java
+++ b/src/com/android/music/WeekSelector.java