aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/notification.xml120
-rw-r--r--res/layout/notification_expanded.xml2
2 files changed, 51 insertions, 71 deletions
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 22e2cb63..55c7be2a 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -14,10 +14,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
android:orientation="vertical"
- android:paddingLeft="11.0dip">
+ android:paddingLeft="11.0dip"
+ android:layout_gravity="center_vertical">
<TextView
android:id="@+id/notification_title"
@@ -28,76 +30,54 @@
android:ellipsize="marquee"
android:focusable="true"
android:singleLine="true" />
-
- <LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:layout_width="0.0dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1.0"
- android:orientation="vertical">
- <TextView
- android:id="@+id/notification_artist"
- style="@android:style/TextAppearance.StatusBar.EventContent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:ellipsize="end"
- android:scrollHorizontally="true"
- android:singleLine="true" />
+ <TextView
+ android:id="@+id/notification_artist"
+ style="@android:style/TextAppearance.StatusBar.EventContent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
+ android:singleLine="true" />
- <TextView
- android:id="@+id/notification_album"
- style="@android:style/TextAppearance.StatusBar.EventContent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:ellipsize="end"
- android:scrollHorizontally="true"
- android:singleLine="true" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/notification_album"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"/>
+ </LinearLayout>
- <ImageButton
- android:id="@+id/control_previous"
- android:src="@drawable/notification_prev"
- android:background="@drawable/btn_bg"
- android:layout_width="34dip"
- android:layout_height="34dip"
- android:layout_gravity="center|right"
- android:layout_marginRight="10dip"
- android:layout_marginTop="2dip"
- android:layout_weight="0.0"
- android:scaleType="fitXY"/>
+ <ImageButton
+ android:id="@+id/control_previous"
+ android:src="@drawable/notification_previous"
+ android:background="@drawable/btn_bg"
+ android:layout_width="46dip"
+ android:layout_height="fill_parent"
+ android:layout_gravity="center|right"
+ android:padding="8.0dip"
+ android:layout_weight="0.0"
+ android:scaleType="fitCenter"/>
- <ImageButton
- android:id="@+id/control_pause"
- android:src="@drawable/notification_pause"
- android:background="@drawable/btn_bg"
- android:layout_width="34dip"
- android:layout_height="34dip"
- android:layout_gravity="center|right"
- android:layout_marginRight="10dip"
- android:layout_marginTop="2dip"
- android:layout_weight="0.0"
- android:scaleType="fitXY"/>
+ <ImageButton
+ android:id="@+id/control_pause"
+ android:src="@drawable/notification_pause"
+ android:background="@drawable/btn_bg"
+ android:layout_width="46dip"
+ android:layout_height="fill_parent"
+ android:layout_gravity="center|right"
+ android:padding="8.0dip"
+ android:layout_weight="0.0"
+ android:scaleType="fitCenter"/>
- <ImageButton
- android:id="@+id/control_next"
- android:src="@drawable/notification_next"
- android:background="@drawable/btn_bg"
- android:layout_width="34dip"
- android:layout_height="34dip"
- android:layout_gravity="center|right"
- android:layout_marginRight="10dip"
- android:layout_marginTop="2dip"
- android:layout_weight="0.0"
- android:scaleType="fitXY"/>
- </LinearLayout>
- </LinearLayout>
+ <ImageButton
+ android:id="@+id/control_next"
+ android:src="@drawable/notification_next"
+ android:background="@drawable/btn_bg"
+ android:layout_width="46dip"
+ android:layout_height="fill_parent"
+ android:layout_gravity="center|right"
+ android:padding="8.0dip"
+ android:layout_weight="0.0"
+ android:scaleType="fitCenter"/>
</LinearLayout>
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
index 70e7269c..e2246506 100644
--- a/res/layout/notification_expanded.xml
+++ b/res/layout/notification_expanded.xml
@@ -70,7 +70,7 @@
android:layout_weight="0.0"
android:background="@drawable/btn_bg"
android:scaleType="fitXY"
- android:src="@drawable/notification_prev" />
+ android:src="@drawable/notification_previous" />
<ImageButton
android:id="@+id/control_pause"