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

Merge change 21846 into eclair

Browse Source 
* changes:
  Don't call onSurfaceChanged() if nothing interesting has changed.
This commit is contained in:
Android (Google) Code Review
2009-08-18 18:41:13 -07:00
parent 2a1f350c7b cbf1504824
commit 068c5db5c3
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -223,7 +223,7 @@ public abstract class WallpaperService extends Service {
? (mWindowFlags&~WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) ? (mWindowFlags&~WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
: (mWindowFlags|WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE); : (mWindowFlags|WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
if (mCreated) { if (mCreated) {
updateSurface(false); updateSurface(false, false);
} }
} }
@@ -291,7 +291,7 @@ public abstract class WallpaperService extends Service {
public void onSurfaceDestroyed(SurfaceHolder holder) { public void onSurfaceDestroyed(SurfaceHolder holder) {
} }
void updateSurface(boolean force) { void updateSurface(boolean forceRelayout, boolean forceReport) {
int myWidth = mSurfaceHolder.getRequestedWidth(); int myWidth = mSurfaceHolder.getRequestedWidth();
if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.FILL_PARENT; if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.FILL_PARENT;
int myHeight = mSurfaceHolder.getRequestedHeight(); int myHeight = mSurfaceHolder.getRequestedHeight();
@@ -302,8 +302,8 @@ public abstract class WallpaperService extends Service {
boolean sizeChanged = mWidth != myWidth || mHeight != myHeight; boolean sizeChanged = mWidth != myWidth || mHeight != myHeight;
final boolean typeChanged = mType != mSurfaceHolder.getRequestedType(); final boolean typeChanged = mType != mSurfaceHolder.getRequestedType();
final boolean flagsChanged = mCurWindowFlags != mWindowFlags; final boolean flagsChanged = mCurWindowFlags != mWindowFlags;
if (force || creating || formatChanged || sizeChanged || typeChanged if (forceRelayout || creating || formatChanged || sizeChanged
|| flagsChanged) { || typeChanged || flagsChanged) {
if (DEBUG) Log.i(TAG, "Changes: creating=" + creating if (DEBUG) Log.i(TAG, "Changes: creating=" + creating
+ " format=" + formatChanged + " size=" + sizeChanged); + " format=" + formatChanged + " size=" + sizeChanged);
@@ -382,7 +382,14 @@ public abstract class WallpaperService extends Service {
} }
} }
} }
if (force || creating || formatChanged || sizeChanged) { if (forceReport || creating || formatChanged || sizeChanged) {
if (DEBUG) {
RuntimeException e = new RuntimeException();
e.fillInStackTrace();
Log.w(TAG, "forceReport=" + forceReport + " creating=" + creating
+ " formatChanged=" + formatChanged
+ " sizeChanged=" + sizeChanged, e);
}
onSurfaceChanged(mSurfaceHolder, mFormat, onSurfaceChanged(mSurfaceHolder, mFormat,
mCurWidth, mCurHeight); mCurWidth, mCurHeight);
if (callbacks != null) { if (callbacks != null) {
@@ -408,6 +415,7 @@ public abstract class WallpaperService extends Service {
} }
void attach(IWallpaperEngineWrapper wrapper) { void attach(IWallpaperEngineWrapper wrapper) {
if (DEBUG) Log.v(TAG, "attach: " + this + " wrapper=" + wrapper);
mIWallpaperEngine = wrapper; mIWallpaperEngine = wrapper;
mCaller = wrapper.mCaller; mCaller = wrapper.mCaller;
mConnection = wrapper.mConnection; mConnection = wrapper.mConnection;
@@ -423,7 +431,7 @@ public abstract class WallpaperService extends Service {
onCreate(mSurfaceHolder); onCreate(mSurfaceHolder);
mInitializing = false; mInitializing = false;
updateSurface(false); updateSurface(false, false);
} }
void detach() { void detach() {
@@ -499,7 +507,7 @@ public abstract class WallpaperService extends Service {
return; return;
} }
case MSG_UPDATE_SURFACE: case MSG_UPDATE_SURFACE:
mEngine.updateSurface(false); mEngine.updateSurface(true, false);
break; break;
case MSG_VISIBILITY_CHANGED: case MSG_VISIBILITY_CHANGED:
if (DEBUG) Log.v(TAG, "Visibility change in " + mEngine if (DEBUG) Log.v(TAG, "Visibility change in " + mEngine
@@ -524,7 +532,7 @@ public abstract class WallpaperService extends Service {
} break; } break;
case MSG_WINDOW_RESIZED: { case MSG_WINDOW_RESIZED: {
final boolean reportDraw = message.arg1 != 0; final boolean reportDraw = message.arg1 != 0;
mEngine.updateSurface(true); mEngine.updateSurface(true, false);
if (reportDraw) { if (reportDraw) {
try { try {
mEngine.mSession.finishDrawing(mEngine.mWindow); mEngine.mSession.finishDrawing(mEngine.mWindow);

2
services/java/com/android/server/WallpaperManagerService.java
View File

@@ -65,7 +65,7 @@ import com.android.internal.util.FastXmlSerializer;
class WallpaperManagerService extends IWallpaperManager.Stub { class WallpaperManagerService extends IWallpaperManager.Stub {
static final String TAG = "WallpaperService"; static final String TAG = "WallpaperService";
static final boolean DEBUG = true; static final boolean DEBUG = false;
Object mLock = new Object(); Object mLock = new Object();