aboutsummaryrefslogtreecommitdiff
path: root/res/layout-port
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-14 23:47:19 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-14 23:47:19 -0800
commit2ad1a9ace84137b18fd6f35174920ea659dde0a3 (patch)
tree25cc337557bf119c5a82052a8312800fea6fe7be /res/layout-port
parentedaa382b8a37954fd10f47c50066ae718bd21428 (diff)
parentbbf1ec51c18a5deddef714e948f3702b3d11f97c (diff)
downloaddsub-2ad1a9ace84137b18fd6f35174920ea659dde0a3.tar.gz
dsub-2ad1a9ace84137b18fd6f35174920ea659dde0a3.tar.bz2
dsub-2ad1a9ace84137b18fd6f35174920ea659dde0a3.zip
Merge changes
Diffstat (limited to 'res/layout-port')
-rw-r--r--res/layout-port/download.xml66
1 files changed, 10 insertions, 56 deletions
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 4b39286a..38ab069f 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -25,9 +25,8 @@
android:background="@android:color/transparent">
<RelativeLayout android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_above="@+id/download_song_title">
<ImageView
@@ -38,70 +37,25 @@
android:layout_alignParentTop="true"
android:scaleType="centerCrop"/>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/download_overlay_buttons"
- android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/overlayColor"
android:layout_alignParentBottom="true">
- <Button
- android:id="@+id/download_jukebox"
- android:text="RC"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="14dip"
- android:paddingBottom="4dip"/>
-
- <Button
- android:id="@+id/download_equalizer"
- android:text="EQ"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
-
- <Button
- android:id="@+id/download_visualizer"
- android:text="VIS"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
-
- <ImageButton
- android:id="@+id/download_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/download_jukebox"
- android:background="@drawable/menubar_button"
- android:src="@android:drawable/star_big_off"
- android:paddingTop="8dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingBottom="8dip"/>
- </LinearLayout>
+ android:layout_centerHorizontal="true">
+
+ <include layout="@layout/download_action_buttons"/>
+ </LinearLayout>
+ </RelativeLayout>
<LinearLayout
android:id="@+id/download_visualizer_view_layout"
+ android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="60dip"
android:layout_marginLeft="16dip"