aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorKurt Hardin <kurthardin.dev@gmail.com>2012-09-07 11:59:10 -0700
committerKurt Hardin <kurthardin.dev@gmail.com>2012-09-07 11:59:10 -0700
commitbbcb485cd22d1875d487ba3abd39343623a6f84a (patch)
tree7f46b8232e0a09c5731cac9742e4fbb661d13d99 /subsonic-android/res
parent3cb4b52070aad4803c121ac8b6abc9419836c89f (diff)
parentded5e86222e26cc80fe70ed5da4cfe0ed8bf8f54 (diff)
downloaddsub-bbcb485cd22d1875d487ba3abd39343623a6f84a.tar.gz
dsub-bbcb485cd22d1875d487ba3abd39343623a6f84a.tar.bz2
dsub-bbcb485cd22d1875d487ba3abd39343623a6f84a.zip
Merge commit 'ded5e86222e26cc80fe70ed5da4cfe0ed8bf8f54'
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/drawable/appwidget_bg.9.pngbin1784 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable/btn_bg.xml17
-rw-r--r--subsonic-android/res/drawable/widget_background.xml12
-rw-r--r--subsonic-android/res/layout/appwidget.xml5
-rw-r--r--subsonic-android/res/layout/notification.xml6
-rw-r--r--subsonic-android/res/values/colors.xml3
6 files changed, 38 insertions, 5 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
Binary files differ
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/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..e2c797b3 100644
--- a/subsonic-android/res/layout/appwidget.xml
+++ b/subsonic-android/res/layout/appwidget.xml
@@ -3,7 +3,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
- android:background="@drawable/appwidget_bg">
+ android:background="@drawable/widget_background"
+ android:padding="0dp">
<ImageView
android:id="@+id/appwidget_coverart"
android:layout_height="fill_parent"
@@ -43,7 +44,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..2c65d7a0 100644
--- a/subsonic-android/res/layout/notification.xml
+++ b/subsonic-android/res/layout/notification.xml
@@ -60,7 +60,7 @@
<ImageButton
android:id="@+id/control_previous"
android:src="@drawable/notification_prev"
- android:background="@android:color/transparent"
+ android:background="@drawable/btn_bg"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_gravity="center|right"
@@ -71,7 +71,7 @@
<ImageButton
android:id="@+id/control_pause"
android:src="@drawable/notification_pause"
- android:background="@android:color/transparent"
+ android:background="@drawable/btn_bg"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_gravity="center|right"
@@ -82,7 +82,7 @@
<ImageButton
android:id="@+id/control_next"
android:src="@drawable/notification_next"
- android:background="@android:color/transparent"
+ android:background="@drawable/btn_bg"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_gravity="center|right"
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