diff options
author | Winson Chung <winsonc@google.com> | 2011-11-15 12:41:56 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-15 12:41:56 -0800 |
commit | e5129d7f49361df69e804a79696e28b213ea20b0 (patch) | |
tree | 3dc1aab9f9d52ba74da3ce0597246e05a8f6611e /packages | |
parent | 4900001670c5229fa06e57821a3436023c25520d (diff) | |
parent | 9c99aee5b9ea0b929611548b48780fbffa4daeaf (diff) | |
download | frameworks_base-e5129d7f49361df69e804a79696e28b213ea20b0.zip frameworks_base-e5129d7f49361df69e804a79696e28b213ea20b0.tar.gz frameworks_base-e5129d7f49361df69e804a79696e28b213ea20b0.tar.bz2 |
Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index c259c28..ad37603 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -49,8 +49,6 @@ import android.view.Surface; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.ImageView; @@ -131,8 +129,8 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi // Show the intermediate notification mTickerAddSpace = !mTickerAddSpace; mNotificationId = nId; + mNotificationManager = nManager; mNotificationBuilder = new Notification.Builder(context) - .setLargeIcon(croppedIcon) .setTicker(r.getString(R.string.screenshot_saving_ticker) + (mTickerAddSpace ? " " : "")) .setContentTitle(r.getString(R.string.screenshot_saving_title)) @@ -141,9 +139,12 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi .setWhen(System.currentTimeMillis()); Notification n = mNotificationBuilder.getNotification(); n.flags |= Notification.FLAG_NO_CLEAR; - - mNotificationManager = nManager; 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 |