drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1

Browse Source
This commit is contained in:
Winson Chung
2011-11-15 12:41:56 -08:00
committed by Android (Google) Code Review
parent 4900001670 9c99aee5b9
commit e5129d7f49
1 changed files with 6 additions and 5 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

@ -49,8 +49,6 @@ import android.view.Surface;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
@ -131,8 +129,8 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
// Show the intermediate notification // Show the intermediate notification
mTickerAddSpace = !mTickerAddSpace; mTickerAddSpace = !mTickerAddSpace;
mNotificationId = nId; mNotificationId = nId;
mNotificationManager = nManager;
mNotificationBuilder = new Notification.Builder(context) mNotificationBuilder = new Notification.Builder(context)
.setLargeIcon(croppedIcon)
.setTicker(r.getString(R.string.screenshot_saving_ticker) .setTicker(r.getString(R.string.screenshot_saving_ticker)
+ (mTickerAddSpace ? " " : "")) + (mTickerAddSpace ? " " : ""))
.setContentTitle(r.getString(R.string.screenshot_saving_title)) .setContentTitle(r.getString(R.string.screenshot_saving_title))
@ -141,9 +139,12 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
.setWhen(System.currentTimeMillis()); .setWhen(System.currentTimeMillis());
Notification n = mNotificationBuilder.getNotification(); Notification n = mNotificationBuilder.getNotification();
n.flags |= Notification.FLAG_NO_CLEAR; n.flags |= Notification.FLAG_NO_CLEAR;
mNotificationManager = nManager;
mNotificationManager.notify(nId, n); mNotificationManager.notify(nId, n);
// On the tablet, the large icon makes the notification appear as if it is clickable (and
// on small devices, the large icon is not shown) so defer showing the large icon until
// we compose the final post-save notification below.
mNotificationBuilder.setLargeIcon(croppedIcon);
} }
@Override @Override