From 0691ed33ac945b6490a41950e1ab5de44a6f300d Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 4 Jan 2015 20:48:27 +0100
Subject: [PATCH] Fix 4-white-widget The XML layout was messed up and caused
 android 5.0 to render the widget in funny ways.

---
 res/layout-land/four_long_widget.xml | 89 ----------------------------
 res/layout/four_white_widget.xml     |  6 +-
 2 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 res/layout-land/four_long_widget.xml

diff --git a/res/layout-land/four_long_widget.xml b/res/layout-land/four_long_widget.xml
deleted file mode 100644
index c3a9ed73..00000000
--- a/res/layout-land/four_long_widget.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2010 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="fill_parent"
-	android:orientation="horizontal"
-	android:background="#B2191919">
-	<ImageView
-		android:id="@+id/cover"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:adjustViewBounds="true"
-		android:padding="5dip"
-		android:scaleType="fitCenter"
-		android:contentDescription="@string/cover_art" />
-	<LinearLayout
-		android:id="@+id/text_layout"
-		android:layout_width="0px"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:orientation="vertical"
-		android:paddingLeft="8dip"
-		android:paddingRight="8dip">
-		<TextView
-			android:id="@+id/title"
-			android:visibility="gone"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textColor="#fff"
-			android:textSize="20sp"
-			android:textStyle="bold"
-			android:singleLine="true"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="10dip"
-			android:ellipsize="none" />
-		<TextView
-			android:id="@+id/artist"
-			android:text="@string/app_name"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textColor="#fff"
-			android:textSize="16sp"
-			android:singleLine="true"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="10dip"
-			android:ellipsize="none" />
-	</LinearLayout>
-	<ImageButton
-		android:id="@+id/play_pause"
-		android:adjustViewBounds="true"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:src="@drawable/play"
-		android:padding="5dip"
-		android:background="@null"
-		android:scaleType="centerInside"
-		android:contentDescription="@string/play_pause" />
-	<ImageButton
-		android:id="@+id/next"
-		android:adjustViewBounds="true"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:padding="5dip"
-		android:src="@drawable/next"
-		android:background="@null"
-		android:scaleType="centerInside"
-		android:contentDescription="@string/next_song" />
-</LinearLayout>
diff --git a/res/layout/four_white_widget.xml b/res/layout/four_white_widget.xml
index 9c1dfb6a..8f180cd9 100644
--- a/res/layout/four_white_widget.xml
+++ b/res/layout/four_white_widget.xml
@@ -109,10 +109,9 @@ THE SOFTWARE.
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:adjustViewBounds="true"
 				android:background="@drawable/selectable_item_bg"
 				android:contentDescription="@string/play_pause"
-				android:scaleType="centerInside"
+				android:scaleType="fitCenter"
 				android:src="@drawable/widget_play"
 				android:padding="5dip" />
 			<ImageButton
@@ -120,10 +119,9 @@ THE SOFTWARE.
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:adjustViewBounds="true"
 				android:background="@drawable/selectable_item_bg"
 				android:contentDescription="@string/next_song"
-				android:scaleType="centerInside"
+				android:scaleType="fitCenter"
 				android:src="@drawable/widget_next"
 				android:padding="5dip" />
 		</LinearLayout>