From 7f8f9f1d3bf05935d0af50982e2af187188fb57e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 18 Aug 2015 17:43:23 -0700
Subject: Update target version to 22, update notification for white theme

---
 app/src/main/res/layout/notification.xml          | 10 +++---
 app/src/main/res/layout/notification_expanded.xml | 40 ++++++++++-------------
 2 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 7e1c98bf..4a89db49 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -23,7 +23,7 @@
 			
 		<TextView
 			android:id="@+id/notification_title"
-			style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+			style="@style/NotificationText.Title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="left"
@@ -33,7 +33,7 @@
 
 		<TextView
 			android:id="@+id/notification_artist"
-			style="@android:style/TextAppearance.StatusBar.EventContent"
+			style="@style/NotificationText.Content"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="left"
@@ -50,18 +50,18 @@
 
 	<ImageButton
 		android:id="@+id/control_previous"
-		android:src="@drawable/media_backward_dark"
+		android:src="@drawable/notification_backward"
 		style="@style/NotificationButton"/>
 
 	<ImageButton
 		android:id="@+id/control_pause"
-		android:src="@drawable/media_pause_dark"
+		android:src="@drawable/notification_pause"
 		style="@style/NotificationButton"
 		android:layout_width="54dip"
 		android:padding="0dip"/>
 
 	<ImageButton
 		android:id="@+id/control_next"
-		android:src="@drawable/media_forward_dark"
+		android:src="@drawable/notification_forward"
 		style="@style/NotificationButton"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
index bfd3c757..7b378e12 100644
--- a/app/src/main/res/layout/notification_expanded.xml
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -2,7 +2,7 @@
 <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:layout_height="128dp"
     android:orientation="horizontal" >
 		
 	<ImageView
@@ -14,7 +14,7 @@
 	<LinearLayout
 	    xmlns:android="http://schemas.android.com/apk/res/android"
 	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
+	    android:layout_height="fill_parent"
 	    android:layout_weight="0.0"
 	    android:orientation="vertical"
 	    android:paddingLeft="11.0dip" >
@@ -26,11 +26,11 @@
 
 			<TextView
 				android:id="@+id/notification_title"
-				style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+				style="@style/NotificationText.Title"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:layout_gravity="left"
+				android:layout_gravity="left|center_vertical"
 				android:ellipsize="marquee"
 				android:focusable="true"
 				android:singleLine="true" />
@@ -41,14 +41,13 @@
 				android:layout_height="wrap_content"
 				android:src="@drawable/notification_close"
 				style="@style/NotificationButton"
-				android:padding="10dip"
 				android:layout_gravity="right"
-				android:visibility="gone"/>
+				android:visibility="invisible"/>
 		</LinearLayout>
 
 	    <TextView
 	        android:id="@+id/notification_artist"
-	        style="@android:style/TextAppearance.StatusBar.EventContent"
+	        style="@style/NotificationText.Content"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="left"
@@ -58,48 +57,43 @@
 
 	    <TextView
 	        android:id="@+id/notification_album"
-	        style="@android:style/TextAppearance.StatusBar.EventContent"
+	        style="@style/NotificationText.Content"
 	        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/textView1"
-	        android:layout_width="wrap_content"
-	        android:layout_height="fill_parent" />
+	        android:singleLine="true"
+			android:paddingBottom="10dp"/>
 
 		<ImageView
-			android:background="?android:dividerHorizontal"
+			style="@style/NotificationDivider"
 			android:layout_width="fill_parent"
-			android:layout_height="1.0px"/>
+			android:layout_height="1dp"/>
 	    
 	    <LinearLayout
-	        xmlns:android="http://schemas.android.com/apk/res/android"
 	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
+	        android:layout_height="fill_parent"
+			android:layout_weight="1"
 	        android:orientation="horizontal"
 			android:showDividers="middle"
-			android:divider="?android:listDivider">
+			style="@style/NotificationLayoutDivider">
 
 	        <ImageButton
 	            android:id="@+id/control_previous"
 	            style="@style/NotificationButton.Expanded"
-	            android:src="@drawable/media_backward_dark" />
+	            android:src="@drawable/notification_backward" />
 
 	        <ImageButton
 	            android:id="@+id/control_pause"
 				style="@style/NotificationButton.Expanded"
-	            android:src="@drawable/media_pause_dark" />
+	            android:src="@drawable/notification_pause" />
 
 	        <ImageButton
 	            android:id="@+id/control_next"
 				style="@style/NotificationButton.Expanded"
-	            android:src="@drawable/media_forward_dark" />
+	            android:src="@drawable/notification_forward" />
 	    </LinearLayout>
-
 	</LinearLayout>
 
 </LinearLayout>
-- 
cgit v1.2.3