Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 70c9a79127

Change-Id: I35594cbfb73048ae2fe7d3757232d193632d1d5a
This commit is contained in:
android-build-team Robot
2018-05-08 08:45:11 -07:00
committed by android-build-merger
parent 9a20164149 70c9a79127
commit 069d14cfef
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -129,13 +129,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
private final int mImageWidth; private final int mImageWidth;
private final int mImageHeight; 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, SaveImageInBackgroundTask(Context context, SaveImageInBackgroundData data,
NotificationManager nManager) { NotificationManager nManager) {
Resources r = context.getResources(); Resources r = context.getResources();
@@ -176,8 +169,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
Bitmap icon = generateAdjustedHwBitmap(data.image, iconSize, iconSize, matrix, paint, Bitmap icon = generateAdjustedHwBitmap(data.image, iconSize, iconSize, matrix, paint,
overlayColor); overlayColor);
// Show the intermediate notification
mTickerAddSpace = !mTickerAddSpace;
mNotificationManager = nManager; mNotificationManager = nManager;
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
@@ -199,8 +190,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
mNotificationBuilder = new Notification.Builder(context, mNotificationBuilder = new Notification.Builder(context,
NotificationChannels.SCREENSHOTS_HEADSUP) NotificationChannels.SCREENSHOTS_HEADSUP)
.setTicker(r.getString(R.string.screenshot_saving_ticker)
+ (mTickerAddSpace ? " " : ""))
.setContentTitle(r.getString(R.string.screenshot_saving_title)) .setContentTitle(r.getString(R.string.screenshot_saving_title))
.setSmallIcon(R.drawable.stat_notify_image) .setSmallIcon(R.drawable.stat_notify_image)
.setWhen(now) .setWhen(now)