From cb76c98e2fa9aaa78ccea1b925971e288db51d5e Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 4 Jan 2015 22:02:27 +0100
Subject: [PATCH] add material-design notification layout

---
 orig/notification_close_dark.svgz             | Bin 0 -> 1067 bytes
 res/drawable-hdpi/notification_close_dark.png | Bin 0 -> 306 bytes
 res/drawable-mdpi/notification_close_dark.png | Bin 0 -> 193 bytes
 .../notification_close_dark.png               | Bin 0 -> 316 bytes
 res/layout-v21/notification.xml               |  88 ++++++++++++
 res/layout-v21/notification_expanded.xml      | 130 ++++++++++++++++++
 .../android/vanilla/PlaybackService.java      |   9 +-
 7 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 orig/notification_close_dark.svgz
 create mode 100644 res/drawable-hdpi/notification_close_dark.png
 create mode 100644 res/drawable-mdpi/notification_close_dark.png
 create mode 100644 res/drawable-xhdpi/notification_close_dark.png
 create mode 100644 res/layout-v21/notification.xml
 create mode 100644 res/layout-v21/notification_expanded.xml

diff --git a/orig/notification_close_dark.svgz b/orig/notification_close_dark.svgz
new file mode 100644
index 0000000000000000000000000000000000000000..08af81bb09560b6394a5d223f039f133ea2b5a16
GIT binary patch
literal 1067
zcmV+`1l0Q<iwFP!000000G(D%Z{s!)z2{e`$|Z|NACxUyQtT|+4YF9Ey>z$eaY2i;
zO++FElCqur`VJ{kk{t&qD!`D*_h#mCI2>yA`BYclfl9>$U;8MGeUI`|5XN_F|L-5q
zLFRi(V@_}-I9>Z(_@5tdR=)&+_eD~yDe;a>@4avQMU}Xr-rZj7rih~B@ffmxG8A$b
zee#0f@#bcw4!axA^B^u)1u55lZ_u=|vP4oww4ycTT16;Ckw4PQkzShU>_AIV*Mci+
z$<^(IEXj6Y8#Tw7C80deqd19@BmhRBUb)7n;M^26UNcSNIF0}tng5MdC`f1nzk%*1
zLM2*R(k<B0kW(E!{dgL{AP$Kp6E`lOXHn0R%yCUsgG;I+H*f8ajOhK^Pv&;Cr);;^
z!;q1+4|<b4TiWrY98gE-T@?cohx06)dos^wxurPG1renYVJbzlEh}M@1pir9LeZZD
z%a;%$z4?z|vm$h>jBTgDj6gzeF+jJh(o}YM$LMC}ak}t_X{W5h8(KLE>U|h5^eb+a
zVwnG4wSza%tH~2RFssfiC&@1!f8^TOXMR9KHYI?I?{*`9tC~HYAd;%Kf=qYsneRmt
zWzUrm<T8w%oX3m!LoaB8Yz;doMI|J_yUksa#P|L0(>tDk%3%5xHuhY|7g0AtF-<SU
z3;+m9&K8`EYx+p%)Ic;;Vr@h+{y$>RFJpJv{wi^^XXVv6qSZs7Rn*mmt-8n*n*BG_
ztSMM>VDvav;|43*`)%-!_8Gq2+NTFLLJ}$+w6M<^H0C>W+c^}h@jBpFQMJcJ9O0B+
zf^S09Yd;NBI4v={M9b6K4;Cm~E@xS~e1}4`APJX7Ym&V~TPdOM1{Hp#uqOL*0n}a`
zchclW%a&eR8YI|k#OXQ=U7<A{J!m=8&^4RWCF96AtTyNy70S{41BPo}2xafm)>BSb
zGTKAelHEf!KCzm;QDP`v>8xt1F~J&-h2dtPVI;0q!97y^_4GVcby*hw2>CKO7(l=q
zD9N=yv?kL4%K|!ojrAj|VZ+U(@hfzCDA55pBkR{@a!fk6aMtWuxO$J0vS!98`mR}3
zeKSEOr>}R)bVVmeGV0a4qcd6DDsrp0qurR5vr4&a%6}Npdx!3%Xq#FP+MD;dmY6HE
zdQ(a8w}Ow1yZAoHKDl%^Snu5ulzy$K?fX@68{6l>3|y}(P&brqMGJbMToCf0v=lG2
z;P6HB;COMErb8ov75(Wg!gPj`G*0i)EL>#E)JyFvHZ$`M^bp*U=^{z*lXwCrX*jnQ
zqmN_}b_NMh!)!hS6fHa22xj&@+M}eS8utzyV>@%F4}7D%({n}r+jwgd)1ym0i_v(`
ljZHvs4xo?$w1WfIt)!C^5$)jf&s6H;&A-?ee(XI8003+s23Y_A

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/notification_close_dark.png b/res/drawable-hdpi/notification_close_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e443943b39bc55fbd8d8e1235912449b8e39496
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002_Nkl<ZNXPBf
zJC1`e5P;!-5WYbgODRcmu7xsZT63-dWy;(DByWQvFMbipRfJu^;1AE(mc>%0RfU`b
z`W8sEsMHWqqIW=|xzoidQFPpW%Ae7TCk<_w5=BeHlb08<;g2tj7(4Hc1Z!kx3?mm>
zssAx`oQbSjh)OfT)SQ7=28>;{Pai?<V8}5^=uJI<Tbjv0AT>YSfCqhwDR@MRrB-E`
zfu5d$>vmu5gxm$U3noWJQd<v$lg<i9H)NGyMz<<<dGB_$6ACeT%1ccY9Zf8S^(Pa*
z+o(UI6KAGaCG3o0;>^hpc^!?i#5)S@zm?<eKcE8b5C15bcb$q8TmS$707*qoM6N<$
Ef(?j#5C8xG

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/notification_close_dark.png b/res/drawable-mdpi/notification_close_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c5008e535d9568fc6cc148015772480429ef50d
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i4o?@y5R21KCvW6EY{0|vp7*L$
z+vyAu{|8EoD<sz**)q-Z_=L+W9XIyAbL?93<jmaEN&hRGv)X!I8O5yG)FAyj;iGfH
zo(<AR?IV=rc-%D(&n;SabN2$y1skjR^G}62yEXIF8?+0lO7_ZTC_U4#d?!04dSBM-
sCl6NSY<w>v{Z-4^_Hp1<`?`zf584)Xt^CXz0CW?Br>mdKI;Vst0RF>HqW}N^

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/notification_close_dark.png b/res/drawable-xhdpi/notification_close_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ddee1498efdf40e9bd403699e7d14a1dfff0897
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00034Nkl<ZSi|ks
zF%E(-7{&4Tb-;uJbS`(pfjfCOojm}FEOjy35Nh9RBr>$K`Twl6pIF4c%kA86Km!`^
zSHQdlHe$iN2$;u&vkg>!z!_7H$nBs<hZDv!VFN~-(4m)rc*6ycGV#hkaEUi<2Z+})
zk>szr&wM#WC4$Kpj_Ego%NOrKj$re|McX3yJav=Tgpvo0`_unK0VPiZ2>~T90B-_H
z{z&8c{Sy%bqyk7DGBu+_AU&AOj1qzMxz~syuyw5z!s&U9a5Z^_aCLc}aJ6}s$h}nr
zZlond&~`9m;bzW@STJY4YHrw>N1uCB*x2tJ?;`N4b)0G1fCe<6emw!dFQ_9~ljlSL
O0000<MNUMnLSTYF6Nf7R

literal 0
HcmV?d00001

diff --git a/res/layout-v21/notification.xml b/res/layout-v21/notification.xml
new file mode 100644
index 00000000..efec7d29
--- /dev/null
+++ b/res/layout-v21/notification.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2012 Christopher Eby <kreed@kreed.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="64dp"
+	android:orientation="horizontal"
+	>
+	<ImageView
+		android:id="@+id/cover"
+		android:scaleType="fitCenter"
+		android:layout_width="64dp"
+		android:layout_height="64dp"
+		android:layout_marginRight="8dp"
+		android:contentDescription="@string/cover_art" />
+	<LinearLayout
+		android:layout_width="0px"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center"
+		android:orientation="vertical">
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@android:style/TextAppearance.Material.Notification.Title"
+			android:singleLine="true"
+			android:ellipsize="marquee" />
+		<TextView
+			android:id="@+id/artist"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@android:style/TextAppearance.Material.Notification.Line2"
+			android:singleLine="true"
+			android:ellipsize="marquee" />
+	</LinearLayout>
+	<ImageButton
+		android:id="@+id/play_pause"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"
+		android:layout_height="42dp"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/widget_play"
+		android:contentDescription="@string/play_pause" />
+	<ImageButton
+		android:id="@+id/next"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"
+		android:layout_height="42dp"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/widget_next"
+		android:contentDescription="@string/next_song" />
+	<ImageButton
+		android:id="@+id/close"
+		android:padding="5dp"
+		android:layout_height="42dp"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/notification_close_dark"
+		android:contentDescription="@string/close_notification" />
+</LinearLayout>
diff --git a/res/layout-v21/notification_expanded.xml b/res/layout-v21/notification_expanded.xml
new file mode 100644
index 00000000..990d9ab1
--- /dev/null
+++ b/res/layout-v21/notification_expanded.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2014 Adrian Ulrich <adrian@blinkenlights.ch>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>. 
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_gravity="center_vertical"
+	android:orientation="horizontal">
+
+	<ImageView
+		android:id="@+id/cover"
+		android:scaleType="fitCenter"
+		android:layout_width="128dp"
+		android:layout_height="128dp"
+		android:layout_marginRight="8dp"
+		android:contentDescription="@string/cover_art" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1"
+			android:orientation="horizontal">
+			<LinearLayout
+				android:layout_marginTop="4dp"
+				android:layout_width="0px"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:layout_gravity="center"
+				android:orientation="vertical">
+				<TextView
+					android:id="@+id/title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textAppearance="@android:style/TextAppearance.Material.Notification.Title"
+					android:singleLine="true"
+					android:ellipsize="marquee" />
+				<TextView
+					android:id="@+id/artist"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textAppearance="@android:style/TextAppearance.Material.Notification.Line2"
+					android:singleLine="true"
+					android:ellipsize="marquee" />
+				<TextView
+					android:id="@+id/album"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textAppearance="@android:style/TextAppearance.Material.Notification.Line2"
+					android:singleLine="true"
+					android:ellipsize="marquee" />
+			</LinearLayout>
+
+			<ImageButton
+				android:id="@+id/close"
+				android:padding="5dp"
+				android:layout_width="32dp"
+				android:layout_height="32dp"
+				android:scaleType="fitCenter"
+				android:background="?android:attr/selectableItemBackground"
+				android:src="@drawable/notification_close_dark"
+				android:contentDescription="@string/close_notification" />
+		</LinearLayout>
+
+		<!-- start controll buttons -->
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+			<ImageButton
+				android:id="@+id/previous"
+				android:paddingTop="5dp"
+				android:paddingBottom="5dp"
+				android:layout_height="42dp"
+				android:layout_width="match_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:background="?android:attr/selectableItemBackground"
+				android:scaleType="fitCenter"
+				android:src="@drawable/widget_previous"
+				android:contentDescription="@string/next_song" />
+			<ImageButton
+				android:id="@+id/play_pause"
+				android:paddingTop="5dp"
+				android:paddingBottom="5dp"
+				android:layout_height="42dp"
+				android:layout_width="match_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:background="?android:attr/selectableItemBackground"
+				android:scaleType="fitCenter"
+				android:src="@drawable/widget_play"
+				android:contentDescription="@string/play_pause" />
+			<ImageButton
+				android:id="@+id/next"
+				android:paddingTop="5dp"
+				android:paddingBottom="5dp"
+				android:layout_height="42dp"
+				android:layout_width="match_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:background="?android:attr/selectableItemBackground"
+				android:scaleType="fitCenter"
+				android:src="@drawable/widget_next"
+				android:contentDescription="@string/next_song" />
+		</LinearLayout>
+		<!-- end controll buttons -->
+
+	</LinearLayout>
+
+
+</LinearLayout>
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 1376fb17..d61391fd 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -1860,7 +1860,14 @@ public final class PlaybackService extends Service
 
 		String title = song.title;
 
-		int playButton = playing ? R.drawable.pause : R.drawable.play;
+		int playButton = 0;
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			// Android >= 5.0 uses the dark version of this drawable
+			playButton = playing ? R.drawable.widget_pause : R.drawable.widget_play;
+		} else {
+			playButton = playing ? R.drawable.pause : R.drawable.play;
+		}
+
 		views.setImageViewResource(R.id.play_pause, playButton);
 		expanded.setImageViewResource(R.id.play_pause, playButton);