Merge "Remove ticker text for screenshot saving notification." into pi-dev

am: 70c9a79127

Change-Id: I35594cbfb73048ae2fe7d3757232d193632d1d5a

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

@@ -129,13 +129,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
     private final int mImageWidth;
     private final int mImageHeight;
 
-    // WORKAROUND: We want the same notification across screenshots that we update so that we don't
-    // spam a user's notification drawer.  However, we only show the ticker for the saving state
-    // and if the ticker text is the same as the previous notification, then it will not show. So
-    // for now, we just add and remove a space from the ticker text to trigger the animation when
-    // necessary.
-    private static boolean mTickerAddSpace;
-
     SaveImageInBackgroundTask(Context context, SaveImageInBackgroundData data,
             NotificationManager nManager) {
         Resources r = context.getResources();
@@ -176,8 +169,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
         Bitmap icon = generateAdjustedHwBitmap(data.image, iconSize, iconSize, matrix, paint,
                 overlayColor);
 
-        // Show the intermediate notification
-        mTickerAddSpace = !mTickerAddSpace;
         mNotificationManager = nManager;
         final long now = System.currentTimeMillis();
 
@@ -199,8 +190,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
 
         mNotificationBuilder = new Notification.Builder(context,
                 NotificationChannels.SCREENSHOTS_HEADSUP)
-            .setTicker(r.getString(R.string.screenshot_saving_ticker)
-                    + (mTickerAddSpace ? " " : ""))
             .setContentTitle(r.getString(R.string.screenshot_saving_title))
             .setSmallIcon(R.drawable.stat_notify_image)
             .setWhen(now)