diff options
author | Joe Onorato <joeo@google.com> | 2010-11-20 13:20:56 -0800 |
---|---|---|
committer | Joe Onorato <joeo@google.com> | 2010-11-21 16:16:28 -0800 |
commit | 2026e8d4681437fb056409bc95bc2f126582e4a8 (patch) | |
tree | 274a75c6a2415544384d45309c17efdd3b888c05 | |
parent | 8595a3dd9a6feff70f8ddbad924d79b591d611e4 (diff) | |
download | frameworks_base-2026e8d4681437fb056409bc95bc2f126582e4a8.zip frameworks_base-2026e8d4681437fb056409bc95bc2f126582e4a8.tar.gz frameworks_base-2026e8d4681437fb056409bc95bc2f126582e4a8.tar.bz2 |
Show the icon in the compatibilty ticker.
Change-Id: Ib0f466a6773f9e66ad418bf48303504dedf73d21
-rw-r--r-- | packages/SystemUI/res/layout-xlarge/ticker_compat.xml | 8 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout-xlarge/ticker_compat.xml b/packages/SystemUI/res/layout-xlarge/ticker_compat.xml index 79c7543..5703896 100644 --- a/packages/SystemUI/res/layout-xlarge/ticker_compat.xml +++ b/packages/SystemUI/res/layout-xlarge/ticker_compat.xml @@ -20,9 +20,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:background="#ff000000" + android:background="#ff1d1d1d" > + <ImageView android:id="@+id/icon" + android:layout_width="64dp" + android:layout_height="match_parent" + android:scaleType="center" + /> + <TextView android:id="@+id/text" android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker" android:layout_width="match_parent" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java index 051c208..73dbdc38 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java @@ -16,9 +16,12 @@ package com.android.systemui.statusbar.tablet; +import java.util.Arrays; + import android.app.Notification; import android.content.Context; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Message; import android.util.Slog; @@ -31,11 +34,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarNotification; import com.android.systemui.R; - -import java.util.Arrays; +import com.android.systemui.statusbar.StatusBarIconView; public class TabletTicker extends Handler { private static final String TAG = "StatusBar.TabletTicker"; @@ -167,6 +170,10 @@ public class TabletTicker extends Handler { group.addView(expanded, lp); } else if (n.tickerText != null) { group = (ViewGroup)inflater.inflate(R.layout.ticker_compat, mParent, false); + final Drawable icon = StatusBarIconView.getIcon(mContext, + new StatusBarIcon(notification.pkg, n.icon, n.iconLevel, 0)); + ImageView iv = (ImageView)group.findViewById(R.id.icon); + iv.setImageDrawable(icon); TextView tv = (TextView)group.findViewById(R.id.text); tv.setText(n.tickerText); } else { |