Merge branch 'master' into master_star_support

10 files changed, 123 insertions, 82 deletions

diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
index 3b29eae7..d8f892c3 100644
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
+++ b/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
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>
+
diff --git a/subsonic-android/res/layout/appwidget.xml b/subsonic-android/res/layout/appwidget.xml
index 233bc93f..6b3c892e 100644
--- a/subsonic-android/res/layout/appwidget.xml
+++ b/subsonic-android/res/layout/appwidget.xml
@@ -3,7 +3,7 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:orientation="horizontal"
-              android:background="@drawable/appwidget_bg">
+              android:background="@drawable/widget_background">
 <ImageView
 	android:id="@+id/appwidget_coverart"
 	android:layout_height="fill_parent"
@@ -43,7 +43,7 @@
         android:id="@+id/artist"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/appwidget_text"
+        android:textColor="@color/cyan"
         android:minHeight="12sp"
         android:textSize="12sp"
         android:singleLine="true"
diff --git a/subsonic-android/res/layout/notification.xml b/subsonic-android/res/layout/notification.xml
index a234f71e..22e2cb63 100644
--- a/subsonic-android/res/layout/notification.xml
+++ b/subsonic-android/res/layout/notification.xml
@@ -3,93 +3,101 @@
     android:id="@+id/statusbar"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="horizontal" >
+		
+	<ImageView
+		android:id="@+id/notification_image"
+		android:layout_width="64.0dip"
+		android:layout_height="64.0dip"
+		android:layout_weight="0.0"
+		android:gravity="center" />
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="horizontal" >
+        android:orientation="vertical"
+		android:paddingLeft="11.0dip">
+			
+		<TextView
+			android:id="@+id/notification_title"
+			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" />
+			
+		<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/notification_image"
-            android:layout_width="64.0dip"
-            android:layout_height="64.0dip"
-            android:layout_weight="0.0"
-            android:gravity="center" />
+			<LinearLayout
+				android:layout_width="0.0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="1.0"
+				android:orientation="vertical">
 
-        <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/notification_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/notification_title"
-                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/notification_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>
 
-            <TextView
-                android:id="@+id/notification_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" />
+			<ImageButton
+				android:id="@+id/control_previous"
+				android:src="@drawable/notification_prev"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
 
-            <TextView
-                android:id="@+id/notification_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/control_previous"
-            android:src="@drawable/notification_prev"
-            android:background="@android:color/transparent"
-            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"/>
-
-        <ImageButton
-            android:id="@+id/control_pause"
-            android:src="@drawable/notification_pause"
-            android:background="@android:color/transparent"
-            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"/>
-
-        <ImageButton
-            android:id="@+id/control_next"
-            android:src="@drawable/notification_next"
-            android:background="@android:color/transparent"
-            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"/>
+			<ImageButton
+				android:id="@+id/control_pause"
+				android:src="@drawable/notification_pause"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
 
+			<ImageButton
+				android:id="@+id/control_next"
+				android:src="@drawable/notification_next"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
+		</LinearLayout>
     </LinearLayout>
-
 </LinearLayout>
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index 67bb3933..69ab22a1 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -10,4 +10,7 @@
     <color name="wheatBackground">#F1F0E6</color>
     <color name="wheatForeground1">#494B26</color>
     <color name="wheatForeground2">#830009</color>
+	
+	<color name="ics_opaque">#8033b5e5</color>
+	<color name="cyan">#ff0099cc</color>
 </resources>
\ No newline at end of file
diff --git a/subsonic-android/res/xml/appwidget_info.xml b/subsonic-android/res/xml/appwidget_info.xml
index f1e8e308..7ad17ef9 100644
--- a/subsonic-android/res/xml/appwidget_info.xml
+++ b/subsonic-android/res/xml/appwidget_info.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:minWidth="294dip"
-                    android:minHeight="72dip"
+                    android:minWidth="272dip"
+                    android:minHeight="56dip"
                     android:updatePeriodMillis="0"
+					android:resizeMode="horizontal|vertical"
                     android:initialLayout="@layout/appwidget"/>
\ No newline at end of file
diff --git a/subsonic-android/res/xml/searchable.xml b/subsonic-android/res/xml/searchable.xml
index fd68a3ed..80276434 100644
--- a/subsonic-android/res/xml/searchable.xml
+++ b/subsonic-android/res/xml/searchable.xml
@@ -4,6 +4,6 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="github.daneren2005.dsub.provider.SearchSuggestionProvider"
+            android:searchSuggestAuthority="github.daneren2005.dsub.provider.SearchSuggestionProvider1"
             android:searchSuggestSelection=" ?" >
 </searchable>
\ No newline at end of file