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

Merge change 20812

Browse Source 
* changes:
  Fix possible exception in default live wallpaper
This commit is contained in:
Android (Google) Code Review
2009-08-11 14:43:02 -07:00
parent b028f92e75 b4f59bffc0
commit c5ea439209
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/com/android/internal/service/wallpaper/ImageWallpaper.java
View File

@@ -99,32 +99,36 @@ public class ImageWallpaper extends WallpaperService {
void drawFrame(boolean drawText) {
SurfaceHolder sh = getSurfaceHolder();
Canvas c = sh.lockCanvas();
if (c != null) {
final Rect frame = sh.getSurfaceFrame();
mBackground.setBounds(frame);
mBackground.draw(c);
if (drawText) {
// Figure out animation.
long now = SystemClock.uptimeMillis();
while (mAnimStartTime < (now-1000)) {
mAnimStartTime += 1000;
mAnimLarger = !mAnimLarger;
Canvas c = null;
try {
c = sh.lockCanvas();
if (c != null) {
final Rect frame = sh.getSurfaceFrame();
mBackground.setBounds(frame);
mBackground.draw(c);
if (drawText) {
// Figure out animation.
long now = SystemClock.uptimeMillis();
while (mAnimStartTime < (now-1000)) {
mAnimStartTime += 1000;
mAnimLarger = !mAnimLarger;
}
float size = (now-mAnimStartTime) / (float)1000;
if (!mAnimLarger) size = 1-size;
int alpha = (int)(255*(size*size));
mTextPaint.setARGB(alpha, 255, 255, 255);
mTextPaint.setShadowLayer(5*mDensity, 3*mDensity, 3*mDensity,
alpha<<24);
mTextPaint.setTextSize(100 * mDensity * size);
c.drawText("Am I live?",
frame.left + (frame.right-frame.left)/2,
frame.top + (frame.bottom-frame.top)/2, mTextPaint);
}
float size = (now-mAnimStartTime) / (float)1000;
if (!mAnimLarger) size = 1-size;
int alpha = (int)(255*(size*size));
mTextPaint.setARGB(alpha, 255, 255, 255);
mTextPaint.setShadowLayer(5*mDensity, 3*mDensity, 3*mDensity,
alpha<<24);
mTextPaint.setTextSize(100 * mDensity * size);
c.drawText("Am I live?",
frame.left + (frame.right-frame.left)/2,
frame.top + (frame.bottom-frame.top)/2, mTextPaint);
}
} finally {
if (c != null) sh.unlockCanvasAndPost(c);
}
sh.unlockCanvasAndPost(c);
}
}