Fixes an issue with the notification that would crash the application…

… on devices running Android 4
musicbeeremote · May 1, 2015 · dbca8d0 · dbca8d0
1 parent a3b7647
commit dbca8d0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/remote/build.gradle b/remote/build.gradle
@@ -43,8 +43,8 @@ android {
     applicationId "com.kelsos.mbrc"
     minSdkVersion 8
     targetSdkVersion 22
-    versionCode 101
-    versionName "0.10.0"
+    versionCode 102
+    versionName "0.10.1"
     buildConfigField "String", "GIT_SHA", "\"${gitHash()}\""
     buildConfigField "String", "BUILD_TIME", "\"${buildTime()}\""
   }

diff --git a/remote/src/main/res/drawable/notification_button_background.xml b/remote/src/main/res/drawable/notification_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@color/button_material_dark" android:state_pressed="true" />
+  <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/remote/src/main/res/layout-v16/ui_notification_control_expanded.xml b/remote/src/main/res/layout-v16/ui_notification_control_expanded.xml
@@ -93,7 +93,7 @@
         android:layout_width="0dip"
         android:layout_height="@dimen/mbrc_notification_expanded_button_height"
         android:layout_weight="1"
-        android:background="?attr/selectableItemBackground"
+        android:background="@drawable/notification_button_background"
         android:contentDescription="@string/main_button_previous_description"
         android:src="@drawable/ic_action_previous" />
 
@@ -102,7 +102,7 @@
         android:layout_width="0dip"
         android:layout_height="@dimen/mbrc_notification_expanded_button_height"
         android:layout_weight="1"
-        android:background="?attr/selectableItemBackground"
+        android:background="@drawable/notification_button_background"
         android:contentDescription="@string/main_button_play_pause_description"
         android:src="@drawable/ic_action_play" />
 
@@ -111,7 +111,7 @@
         android:layout_width="0dip"
         android:layout_height="@dimen/mbrc_notification_expanded_button_height"
         android:layout_weight="1"
-        android:background="?attr/selectableItemBackground"
+        android:background="@drawable/notification_button_background"
         android:contentDescription="@string/main_button_next_description"
         android:focusable="false"
         android:src="@drawable/ic_action_next" />
@@ -124,7 +124,7 @@
       android:layout_alignParentEnd="true"
       android:layout_alignParentRight="true"
       android:layout_alignParentTop="true"
-      android:background="?attr/selectableItemBackground"
+      android:background="@drawable/notification_button_background"
       android:contentDescription="@string/description_button_notification_close"
       android:padding="@dimen/small_margin"
       android:src="@drawable/ic_action_collapse" />

diff --git a/remote/src/main/res/layout/ui_notification_control.xml b/remote/src/main/res/layout/ui_notification_control.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="64dp"
     android:orientation="horizontal">
 
   <ImageView
@@ -50,7 +50,7 @@
       android:layout_width="@dimen/mbrc_notification_button_height"
       android:layout_height="@dimen/mbrc_notification_button_height"
       android:layout_gravity="center|end"
-      android:background="?attr/selectableItemBackground"
+      android:background="@drawable/notification_button_background"
       android:contentDescription="@string/main_button_play_pause_description"
       android:src="@drawable/ic_action_play" />
 
@@ -59,7 +59,7 @@
       android:layout_width="@dimen/mbrc_notification_button_height"
       android:layout_height="@dimen/mbrc_notification_button_height"
       android:layout_gravity="center|end"
-      android:background="?attr/selectableItemBackground"
+      android:background="@drawable/notification_button_background"
       android:contentDescription="@string/main_button_next_description"
       android:src="@drawable/ic_action_next" />
 
@@ -68,7 +68,7 @@
       android:layout_width="@dimen/mbrc_notification_button_height"
       android:layout_height="@dimen/mbrc_notification_button_height"
       android:layout_gravity="center|end"
-      android:background="?attr/selectableItemBackground"
+      android:background="@drawable/notification_button_background"
       android:contentDescription="@string/description_button_notification_close"
       android:src="@drawable/ic_action_collapse" />