aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-01-19 14:07:44 -0800
committerScott Jackson <daneren2005@gmail.com>2014-01-19 14:07:44 -0800
commit5cc2e1596af9edb33e74ee648ccf8fc3755bed96 (patch)
tree3ce565aa4766b778af55b266e6b5321f11264b3f /res/layout
parentfdda03ceed2b46a4a008dac48e88c4bc5e654aa3 (diff)
parent7d53ef61b7498a8dd0e5f63bc2e907eb4937b261 (diff)
downloaddsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.tar.gz
dsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.tar.bz2
dsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.zip
Merge commit
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/download_action_buttons.xml33
-rw-r--r--res/layout/select_album_header.xml11
2 files changed, 10 insertions, 34 deletions
diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml
deleted file mode 100644
index e3a45151..00000000
--- a/res/layout/download_action_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/download_other_controls_layout"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal">
-
- <Button
- android:id="@+id/download_jukebox"
- android:text="RC"
- style="@style/DownloadActionButton"/>
-
- <Button
- android:id="@+id/download_equalizer"
- android:text="EQ"
- style="@style/DownloadActionButton"/>
-
- <Button
- android:id="@+id/download_visualizer"
- android:text="VIS"
- style="@style/DownloadActionButton"/>
-
- <ImageButton
- android:id="@+id/download_star"
- style="@style/DownloadActionImageButton"
- android:src="@android:drawable/star_big_off"/>
-
- <ImageButton
- android:id="@+id/download_bookmark"
- style="@style/DownloadActionImageButton"
- android:src="?attr/bookmark"/>
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index 14bdf365..8f5883bf 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -30,7 +30,16 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
android:singleLine="true"
- android:ellipsize="end"/>
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:focusable="true"
+ android:focusableInTouchMode="true">
+
+ <requestFocus android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:duplicateParentState="true" />
+ </TextView>
<TextView
android:text="This is the artist name"