Merge branch 'master' into master_star_support

4 files changed, 29 insertions, 0 deletions

diff --git a/subsonic-android/res/drawable/appwidget_bg.9.png b/subsonic-android/res/drawable/appwidget_bg.9.png
deleted file mode 100644
index afe41b67..00000000
--- a/subsonic-android/res/drawable/appwidget_bg.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/btn_bg.xml b/subsonic-android/res/drawable/btn_bg.xml
new file mode 100644
index 00000000..79d40784
--- /dev/null
+++ b/subsonic-android/res/drawable/btn_bg.xml
@@ -0,0 +1,17 @@
+<?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"/>

+

+</selector>
\ No newline at end of file
diff --git a/subsonic-android/res/drawable/notification_play.png b/subsonic-android/res/drawable/notification_play.png
new file mode 100644
index 00000000..8c95b6a5
--- /dev/null
+++ b/subsonic-android/res/drawable/notification_play.png
diff --git a/subsonic-android/res/drawable/widget_background.xml b/subsonic-android/res/drawable/widget_background.xml
new file mode 100644
index 00000000..fe641900
--- /dev/null
+++ b/subsonic-android/res/drawable/widget_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/appwidget_overlay" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_overlay" />
+
+    <item android:drawable="@drawable/appwidget_bg" />
+</selector>
+