summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-03-21 03:47:28 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-03-21 03:47:28 -0700
commit14ad1d769fd111eab09e0695d02ded3174128fa4 (patch)
tree6bea39244e6fad8c48ebd6e182748d8cf6f52a26
parentdd155249a9ef9623b2170b87c9e80985e786cff3 (diff)
parentdc2cdeb4269accdadd013d27533c3e63ed4bfc64 (diff)
downloadandroid_packages_apps_Eleven-14ad1d769fd111eab09e0695d02ded3174128fa4.tar.gz
android_packages_apps_Eleven-14ad1d769fd111eab09e0695d02ded3174128fa4.tar.bz2
android_packages_apps_Eleven-14ad1d769fd111eab09e0695d02ded3174128fa4.zip
Merge "Fix some scaling issues with non-square album art." into cm-13.0
-rw-r--r--res/layout/album_art_fragment.xml6
-rw-r--r--res/layout/bottom_action_bar.xml2
2 files changed, 3 insertions, 5 deletions
diff --git a/res/layout/album_art_fragment.xml b/res/layout/album_art_fragment.xml
index 59a5ad7..423c62c 100644
--- a/res/layout/album_art_fragment.xml
+++ b/res/layout/album_art_fragment.xml
@@ -22,7 +22,5 @@
android:id="@+id/audio_player_album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_centerHorizontal="true"
- android:scaleType="fitXY"
- android:background="@drawable/default_artwork"/>
-</FrameLayout> \ No newline at end of file
+ android:src="@drawable/default_artwork"/>
+</FrameLayout>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index fd0d680..8ce90fd 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
- android:background="@drawable/default_artwork" />
+ android:src="@drawable/default_artwork" />
<RelativeLayout
android:id="@+id/bottom_action_bar_info_container"