commit 6719e7013ee7ffb3294728dd0b08fc920d5bc95a
author Wink Saville <wink@google.com> Tue Mar 25 20:24:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 20:24:10 2014 +0000
tree 20bbf5f31440b5d837e6997e44e3fdf5c981d6b7
parent d293f609329e138b0d94ec24b73774cc67b2c5e4
parent 4eb18ffbd6348e34f648d4cc3c3d1f2dec3d68fe

am 4eb18ffb: Merge "Improve STK idle mode text handling"

* commit '4eb18ffbd6348e34f648d4cc3c3d1f2dec3d68fe':
  Improve STK idle mode text handling

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 1212ea7..d98c14b 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -780,7 +780,11 @@
 
             final Notification.Builder notificationBuilder = new Notification.Builder(
                     StkAppService.this);
-            notificationBuilder.setContentTitle("");
+            if (mMainCmd != null && mMainCmd.getMenu() != null) {
+                notificationBuilder.setContentTitle(mMainCmd.getMenu().title);
+            } else {
+                notificationBuilder.setContentTitle("");
+            }
             notificationBuilder
                     .setSmallIcon(com.android.internal.R.drawable.stat_notify_sim_toolkit);
             notificationBuilder.setContentIntent(pendingIntent);
@@ -788,6 +792,7 @@
             // Set text and icon for the status bar and notification body.
             if (!msg.iconSelfExplanatory) {
                 notificationBuilder.setContentText(msg.text);
+                notificationBuilder.setTicker(msg.text);
             }
             if (msg.icon != null) {
                 notificationBuilder.setLargeIcon(msg.icon);