summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-09-02 10:10:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-02 10:10:08 -0700
commitce8c430a7502447d020f6be2d97241419b6e0eac (patch)
tree8f585f0d73a5a67435818dea20d3f59f319f2917 /core
parent189a6db36b60424c2ba14ac2e0176f3ccbeaed30 (diff)
parent52f159c79e4ed3367a929f4bc34ab3e184f82a15 (diff)
downloadframeworks_base-ce8c430a7502447d020f6be2d97241419b6e0eac.zip
frameworks_base-ce8c430a7502447d020f6be2d97241419b6e0eac.tar.gz
frameworks_base-ce8c430a7502447d020f6be2d97241419b6e0eac.tar.bz2
am 52f159c7: Merge "Fix notification ticker info text alignment."
* commit '52f159c79e4ed3367a929f4bc34ab3e184f82a15': Fix notification ticker info text alignment.
Diffstat (limited to 'core')
-rw-r--r--core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml4
-rw-r--r--core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml3
2 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml b/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml
index 7631781..269e086 100644
--- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml
+++ b/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml
@@ -38,8 +38,8 @@
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginTop="-10dp"
+ android:layout_marginBottom="6dip"
+ android:gravity="bottom"
android:singleLine="true"
/>
</LinearLayout>
-
diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml b/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml
index ff0f7d4..69eac92 100644
--- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml
+++ b/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml
@@ -33,8 +33,9 @@
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:layout_marginBottom="6dip"
+ android:gravity="bottom"
android:singleLine="true"
- android:layout_marginTop="-10dp"
/>
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"