Bug 615897 - Use text rather than title for Android notificaiton ticker text r=blassey, a=approval-2.0

embedding/android/AlertNotification.java

@@ -50,18 +50,21 @@ public class AlertNotification
     int mId;
     int mIcon;
     String mTitle;
+    String mText;
     boolean mProgressStyle;
     NotificationManager mNotificationManager;
     double mPrevPercent  = -1;
     String mPrevAlertText = "";
     static final double UPDATE_THRESHOLD = .01;
 
-    public AlertNotification(Context aContext, int aNotificationId, int aIcon, String aTitle, long aWhen) {
-        super(aIcon, aTitle, aWhen);
+    public AlertNotification(Context aContext, int aNotificationId, int aIcon,
+                             String aTitle, String aText, long aWhen) {
+        super(aIcon, (aText.length() > 0) ? aText : aTitle, aWhen);
 
         mContext = aContext;
         mIcon = aIcon;
         mTitle = aTitle;
+        mText = aText;
         mProgressStyle = false;
         mId = aNotificationId;
 

embedding/android/GeckoAppShell.java

@@ -587,7 +587,7 @@ class GeckoAppShell
         removeNotification(notificationID);
 
         AlertNotification notification = new AlertNotification(GeckoApp.mAppContext,
-            notificationID, icon, aAlertTitle, System.currentTimeMillis());
+            notificationID, icon, aAlertTitle, aAlertText, System.currentTimeMillis());
 
         // The intent to launch when the user clicks the expanded notification
         Intent notificationIntent = new Intent(GeckoApp.ACTION_ALERT_CLICK);