From 1bb44eb17259beabc6d39ea720296996d3507ef6 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Thu, 23 Apr 2015 18:09:21 +0200
Subject: [PATCH] Bugfix: unbreak widgets Widgets can not have custom views so
 we must use a controls-layout with ImageView

---
 res/layout/controls_widget.xml | 74 ++++++++++++++++++++++++++++++++++
 res/layout/widget_e.xml        |  2 +-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/controls_widget.xml

diff --git a/res/layout/controls_widget.xml b/res/layout/controls_widget.xml
new file mode 100644
index 00000000..a4b31702
--- /dev/null
+++ b/res/layout/controls_widget.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<!-- this is almost the same file as controls.xml but uses a plain
+     image button as the drawable in widgets are not styled and
+     using a custom view would not be possible anyway //-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+	<ImageButton
+		android:id="@+id/shuffle"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/shuffle_inactive"
+		android:contentDescription="@string/cycle_shuffle_mode" />
+	<ImageButton
+		android:id="@+id/previous"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/previous"
+		android:contentDescription="@string/previous_song" />
+	<ImageButton
+		android:id="@+id/play_pause"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/play"
+		android:contentDescription="@string/play_pause" />
+	<ImageButton
+		android:id="@+id/next"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/next"
+		android:contentDescription="@string/next_song" />
+	<ImageButton
+		android:id="@+id/end_action"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/repeat_inactive"
+		android:contentDescription="@string/cycle_repeat_mode" />
+</merge>
diff --git a/res/layout/widget_e.xml b/res/layout/widget_e.xml
index 040cd035..af6d21b0 100644
--- a/res/layout/widget_e.xml
+++ b/res/layout/widget_e.xml
@@ -53,6 +53,6 @@ THE SOFTWARE.
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content">
-		<include layout="@layout/controls" />
+		<include layout="@layout/controls_widget" />
 	</LinearLayout>
 </LinearLayout>