summaryrefslogtreecommitdiffstats
path: root/core/res/res/layout-xlarge
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-01-28 11:10:14 -0500
committerDaniel Sandler <dsandler@google.com>2011-01-28 14:55:42 -0500
commitdb173394aa60b966e03a4749f38592fa6ac05b61 (patch)
tree1f09d62bc01375c34c81feb1706ddecd4445d94b /core/res/res/layout-xlarge
parentc38b7c820af52c4d5f6f51c750136d18d9897e5e (diff)
downloadframeworks_base-db173394aa60b966e03a4749f38592fa6ac05b61.zip
frameworks_base-db173394aa60b966e03a4749f38592fa6ac05b61.tar.gz
frameworks_base-db173394aa60b966e03a4749f38592fa6ac05b61.tar.bz2
Fix overlapping app icon & info in notifications with large icons.
Bug: 3398728 Bug: 3394785 Change-Id: I50f065d482815612b2b187f1bc4360489d7455e6
Diffstat (limited to 'core/res/res/layout-xlarge')
-rw-r--r--core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml34
-rw-r--r--core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml10
2 files changed, 20 insertions, 24 deletions
diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml b/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
index e9b106d..fcbdf6d 100644
--- a/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
+++ b/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
@@ -30,27 +30,21 @@
android:fadingEdge="horizontal"
/>
</LinearLayout>
- <RelativeLayout
+ <TextView android:id="@+id/info"
+ android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- >
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:singleLine="true"
- android:gravity="center_vertical"
- android:layout_alignParentLeft="true"
- android:paddingLeft="8dp"
- />
- <ImageView android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignRight="@id/info"
- android:layout_marginBottom="8dip"
- android:scaleType="center"
- />
- </RelativeLayout>
+ android:singleLine="true"
+ android:gravity="center_vertical"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ />
+ <ImageView android:id="@+id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginBottom="13dip"
+ android:scaleType="center"
+ />
</LinearLayout>
diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml b/core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml
index b382c55..ff0f7d4 100644
--- a/core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml
+++ b/core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml
@@ -37,11 +37,13 @@
android:layout_marginTop="-10dp"
/>
<ImageView android:id="@+id/icon"
- android:layout_width="48dp"
- android:layout_height="32dp"
- android:layout_gravity="top"
- android:layout_marginTop="6dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginBottom="13dip"
android:scaleType="center"
+ android:layout_marginRight="4dip"
+ android:layout_marginLeft="16dip"
/>
</LinearLayout>