diff options
| author | Joe Onorato <joeo@google.com> | 2010-11-21 15:34:48 -0800 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-11-21 16:16:29 -0800 |
| commit | 52f80cd36f406725e85a1825741a45c69de3d898 (patch) | |
| tree | 8d4e9132fbd8ef9cb25fb2e5c71d33b43fdf9771 /core | |
| parent | 4cddc98a4b63961e3528c5a70cd5c55a67a0c60a (diff) | |
| download | frameworks_base-52f80cd36f406725e85a1825741a45c69de3d898.zip frameworks_base-52f80cd36f406725e85a1825741a45c69de3d898.tar.gz frameworks_base-52f80cd36f406725e85a1825741a45c69de3d898.tar.bz2 | |
The icon sticks out of the ticker.
The ticker still needs to show up over the status bar, which will take a bit of
window manager work, so it's just out of position for now.
Change-Id: Ib5781925db63a22d9352a7b5017a36eec3229395
Diffstat (limited to 'core')
5 files changed, 24 insertions, 10 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 3af6917..920e457 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -721,6 +721,12 @@ public class Notification implements Parcelable return this; } + public Builder setSound(Uri sound) { + mSound = sound; + mAudioStreamType = STREAM_DEFAULT; + return this; + } + public Builder setSound(Uri sound, int streamType) { mSound = sound; mAudioStreamType = streamType; @@ -757,6 +763,10 @@ public class Notification implements Parcelable public Builder setDefaults(int defaults) { mDefaults = defaults; + int moreFlags = 0; + if ((defaults & DEFAULT_LIGHTS) != 0) { + moreFlags |= FLAG_SHOW_LIGHTS; + } return this; } diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_content.xml b/core/res/res/layout-xlarge/status_bar_latest_event_content.xml index 3afd08a..e4aa270 100644 --- a/core/res/res/layout-xlarge/status_bar_latest_event_content.xml +++ b/core/res/res/layout-xlarge/status_bar_latest_event_content.xml @@ -37,8 +37,9 @@ <TextView android:id="@+id/info" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_height="match_parent" + android:singleLine="true" + android:gravity="center_vertical" android:paddingLeft="8dp" /> </LinearLayout> 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 9dcc7c7..1e1f9de 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,8 +30,9 @@ <TextView android:id="@+id/info" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_height="match_parent" + android:singleLine="true" + android:gravity="center_vertical" android:paddingLeft="8dp" /> <ImageView android:id="@+id/icon" diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_ticker.xml b/core/res/res/layout-xlarge/status_bar_latest_event_ticker.xml index 4861d84..b09ed44 100644 --- a/core/res/res/layout-xlarge/status_bar_latest_event_ticker.xml +++ b/core/res/res/layout-xlarge/status_bar_latest_event_ticker.xml @@ -4,7 +4,7 @@ > <ImageView android:id="@+id/icon" android:layout_width="48dp" - android:layout_height="64dp" + android:layout_height="match_parent" android:scaleType="center" /> <LinearLayout @@ -36,8 +36,9 @@ <TextView android:id="@+id/info" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_height="match_parent" + android:singleLine="true" + android:gravity="center_vertical" /> </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 4f4afd2..6c2e6f7 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 @@ -31,12 +31,13 @@ <TextView android:id="@+id/info" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_height="match_parent" + android:singleLine="true" + android:gravity="center_vertical" /> <ImageView android:id="@+id/icon" android:layout_width="48dp" - android:layout_height="64dp" + android:layout_height="match_parent" android:scaleType="center" /> </LinearLayout> |