From 74c78c326cad7a9869897a56636079bf9176b81f Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 18 Jul 2015 18:06:13 -0700
Subject: Remove v11 styles + move to borderless background for buttons

---
 app/src/main/res/layout/appwidget4x1.xml          | 8 ++++----
 app/src/main/res/layout/appwidget4x2.xml          | 8 ++++----
 app/src/main/res/layout/appwidget4x3.xml          | 8 ++++----
 app/src/main/res/layout/appwidget4x4.xml          | 8 ++++----
 app/src/main/res/layout/notification.xml          | 6 +++---
 app/src/main/res/layout/notification_expanded.xml | 8 ++++----
 app/src/main/res/values-v11/styles.xml            | 6 ------
 app/src/main/res/values/styles.xml                | 5 ++++-
 8 files changed, 27 insertions(+), 30 deletions(-)
 delete mode 100644 app/src/main/res/values-v11/styles.xml

(limited to 'app/src')

diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml
index 8f52c872..81e77852 100644
--- a/app/src/main/res/layout/appwidget4x1.xml
+++ b/app/src/main/res/layout/appwidget4x1.xml
@@ -30,7 +30,7 @@
             android:clickable="true"
             android:focusable="true"
             android:orientation="vertical"
-			style="@style/BasicButton">
+			style="@style/NotificationButton">
 
             <TextView
                 android:id="@+id/title"
@@ -81,7 +81,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
 				android:scaleType="center"
-                style="@style/BasicButton"
+                style="@style/NotificationButton"
                 android:src="@drawable/ic_appwidget_music_previous" />
 
             <ImageButton
@@ -91,7 +91,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"              
                 android:src="@drawable/ic_appwidget_music_play"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -100,7 +100,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"
                 android:src="@drawable/ic_appwidget_music_next"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml
index 5763fb01..d2a42ff0 100644
--- a/app/src/main/res/layout/appwidget4x2.xml
+++ b/app/src/main/res/layout/appwidget4x2.xml
@@ -32,7 +32,7 @@
             android:orientation="vertical"
             android:paddingTop="4dip"
             android:paddingBottom="4dip"
-			style="@style/BasicButton">
+			style="@style/NotificationButton">
 
             <TextView
                 android:id="@+id/title"
@@ -104,7 +104,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:scaleType="center"
-                style="@style/BasicButton"
+                style="@style/NotificationButton"
                 android:src="@drawable/ic_appwidget_music_previous" />
 
             <ImageButton
@@ -114,7 +114,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"              
                 android:src="@drawable/ic_appwidget_music_play"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -123,7 +123,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"
                 android:src="@drawable/ic_appwidget_music_next"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml
index 539b9f01..77a15ad5 100644
--- a/app/src/main/res/layout/appwidget4x3.xml
+++ b/app/src/main/res/layout/appwidget4x3.xml
@@ -34,7 +34,7 @@
             android:orientation="vertical"
             android:paddingBottom="4dip"
             android:paddingTop="4dip"
-			style="@style/BasicButton">
+			style="@style/NotificationButton">
 
             <TextView
                 android:id="@+id/title"
@@ -86,7 +86,7 @@
                 android:layout_height="56dip"
                 android:layout_weight="1"
                 android:scaleType="center"
-                style="@style/BasicButton"
+                style="@style/NotificationButton"
                 android:src="@drawable/ic_appwidget_music_previous" />
 
             <ImageButton
@@ -96,7 +96,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"              
                 android:src="@drawable/ic_appwidget_music_play"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -105,7 +105,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"
                 android:src="@drawable/ic_appwidget_music_next"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml
index 1f2db9e1..56f5c622 100644
--- a/app/src/main/res/layout/appwidget4x4.xml
+++ b/app/src/main/res/layout/appwidget4x4.xml
@@ -35,7 +35,7 @@
             android:orientation="vertical"
             android:paddingTop="4dip"
             android:paddingBottom="4dip"
-			style="@style/BasicButton">
+			style="@style/NotificationButton">
 
             <TextView
                 android:id="@+id/title"
@@ -88,7 +88,7 @@
                 android:layout_height="56dip"
                 android:layout_weight="1"
                 android:scaleType="center"
-                style="@style/BasicButton"
+                style="@style/NotificationButton"
                 android:src="@drawable/ic_appwidget_music_previous" />
 
             <ImageButton
@@ -98,7 +98,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"              
                 android:src="@drawable/ic_appwidget_music_play"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -107,7 +107,7 @@
                 android:layout_weight="1"
                 android:scaleType="center"
                 android:src="@drawable/ic_appwidget_music_next"
-				style="@style/BasicButton" />
+				style="@style/NotificationButton" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 12efa4ec..e7c24acf 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -51,7 +51,7 @@
 	<ImageButton
 		android:id="@+id/control_previous"
 		android:src="@drawable/notification_previous"
-		style="@style/BasicButton"
+		style="@style/NotificationButton"
 		android:layout_width="46dip"
 		android:layout_height="fill_parent"
 		android:layout_gravity="center|right"
@@ -62,7 +62,7 @@
 	<ImageButton
 		android:id="@+id/control_pause"
 		android:src="@drawable/notification_pause"
-		style="@style/BasicButton"
+		style="@style/NotificationButton"
 		android:layout_width="46dip"
 		android:layout_height="fill_parent"
 		android:layout_gravity="center|right"
@@ -73,7 +73,7 @@
 	<ImageButton
 		android:id="@+id/control_next"
 		android:src="@drawable/notification_next"
-		style="@style/BasicButton"
+		style="@style/NotificationButton"
 		android:layout_width="46dip"
 		android:layout_height="fill_parent"
 		android:layout_gravity="center|right"
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
index aa9fe759..79d694db 100644
--- a/app/src/main/res/layout/notification_expanded.xml
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -40,7 +40,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:src="@drawable/notification_close"
-				style="@style/BasicButton"
+				style="@style/NotificationButton"
 				android:padding="10dip"
 				android:layout_gravity="right"
 				android:visibility="gone"/>
@@ -91,7 +91,7 @@
 	            android:layout_gravity="center"
 	            android:layout_weight="1"
 				android:padding="10dip"
-	            style="@style/BasicButton"
+	            style="@style/NotificationButton"
 	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_previous" />
 
@@ -102,7 +102,7 @@
 				android:layout_gravity="center"
 				android:layout_weight="1"
 				android:padding="10dip"
-	            style="@style/BasicButton"
+	            style="@style/NotificationButton"
 	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_pause" />
 
@@ -113,7 +113,7 @@
 				android:layout_gravity="center"
 				android:layout_weight="1"
 				android:padding="10dip"
-	            style="@style/BasicButton"
+	            style="@style/NotificationButton"
 	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_next" />
 	    </LinearLayout>
diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
deleted file mode 100644
index 9a7cb2b2..00000000
--- a/app/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="BasicButton">
-		<item name="android:background">?android:selectableItemBackground</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 83fa4a42..f5173619 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="BasicButton">
-		<item name="android:background">?attr/selectableItemBackground</item>
+		<item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+	</style>
+	<style name="NotificationButton">
+		<item name="android:background">?android:selectableItemBackground</item>
 	</style>
 
 	<style name="MoreButton" parent="BasicButton">
-- 
cgit v1.2.3