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

Merge "Fix surface frame size reporting." into honeycomb

Browse Source
This commit is contained in:
Jeff Brown
2011-01-25 14:21:00 -08:00
committed by Android (Google) Code Review
parent 47fc854ae9 30bc34f191
commit 3168a13723
6 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,7 +546,8 @@ public abstract class WallpaperService extends Service {
sizeChanged = true;
mCurHeight = h;
}
mSurfaceHolder.setSurfaceFrameSize(w, h);
mSurfaceHolder.mSurfaceLock.unlock();
if (!mSurfaceHolder.mSurface.isValid()) {

12
core/java/android/view/SurfaceView.java
View File

@@ -158,6 +158,7 @@ public class SurfaceView extends View {
int mHeight = -1;
int mFormat = -1;
final Rect mSurfaceFrame = new Rect();
Rect mTmpDirty;
int mLastSurfaceWidth = -1, mLastSurfaceHeight = -1;
boolean mUpdateWindowNeeded;
boolean mReportDrawNeeded;
@@ -739,9 +740,16 @@ public class SurfaceView extends View {
Canvas c = null;
if (!mDrawingStopped && mWindow != null) {
Rect frame = dirty != null ? dirty : mSurfaceFrame;
if (dirty == null) {
if (mTmpDirty == null) {
mTmpDirty = new Rect();
}
mTmpDirty.set(mSurfaceFrame);
dirty = mTmpDirty;
}
try {
c = mSurface.lockCanvas(frame);
c = mSurface.lockCanvas(dirty);
} catch (Exception e) {
Log.e(LOG_TAG, "Exception locking surface", e);
}

1
core/java/android/view/ViewRoot.java
View File

@@ -1082,6 +1082,7 @@ public final class ViewRoot extends Handler implements ViewParent,
//mSurfaceHolder.mSurface.copyFrom(mSurface);
mSurfaceHolder.mSurface = mSurface;
}
mSurfaceHolder.setSurfaceFrameSize(mWidth, mHeight);
mSurfaceHolder.mSurfaceLock.unlock();
if (mSurface.isValid()) {
if (!hadSurface) {

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

@@ -88,9 +88,13 @@ public class ImageWallpaper extends WallpaperService {
class WallpaperObserver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
if (DEBUG) {
Log.d(TAG, "onReceive");
}
synchronized (mLock) {
updateWallpaperLocked();
drawFrameLocked(true, false);
drawFrameLocked();
}
// Assume we are the only one using the wallpaper in this
@@ -101,6 +105,10 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void onCreate(SurfaceHolder surfaceHolder) {
if (DEBUG) {
Log.d(TAG, "onCreate");
}
super.onCreate(surfaceHolder);
IntentFilter filter = new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED);
mReceiver = new WallpaperObserver();
@@ -120,9 +128,18 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void onVisibilityChanged(boolean visible) {
if (DEBUG) {
Log.d(TAG, "onVisibilityChanged: visible=" + visible);
}
synchronized (mLock) {
mVisible = visible;
drawFrameLocked(false, false);
if (mVisible != visible) {
if (DEBUG) {
Log.d(TAG, "Visibility changed to visible=" + visible);
}
mVisible = visible;
drawFrameLocked();
}
}
}
@@ -135,6 +152,12 @@ public class ImageWallpaper extends WallpaperService {
public void onOffsetsChanged(float xOffset, float yOffset,
float xOffsetStep, float yOffsetStep,
int xPixels, int yPixels) {
if (DEBUG) {
Log.d(TAG, "onOffsetsChanged: xOffset=" + xOffset + ", yOffset=" + yOffset
+ ", xOffsetStep=" + xOffsetStep + ", yOffsetStep=" + yOffsetStep
+ ", xPixels=" + xPixels + ", yPixels=" + yPixels);
}
synchronized (mLock) {
if (mXOffset != xOffset || mYOffset != yOffset) {
if (DEBUG) {
@@ -142,36 +165,27 @@ public class ImageWallpaper extends WallpaperService {
}
mXOffset = xOffset;
mYOffset = yOffset;
drawFrameLocked(false, true);
} else {
drawFrameLocked(false, false);
mOffsetsChanged = true;
}
drawFrameLocked();
}
}
@Override
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
if (DEBUG) {
Log.d(TAG, "onSurfaceChanged: width=" + width + ", height=" + height);
}
super.onSurfaceChanged(holder, format, width, height);
synchronized (mLock) {
drawFrameLocked(true, false);
mRedrawNeeded = true;
drawFrameLocked();
}
}
@Override
public void onSurfaceCreated(SurfaceHolder holder) {
super.onSurfaceCreated(holder);
}
@Override
public void onSurfaceDestroyed(SurfaceHolder holder) {
super.onSurfaceDestroyed(holder);
}
void drawFrameLocked(boolean redrawNeeded, boolean offsetsChanged) {
mRedrawNeeded |= redrawNeeded;
mOffsetsChanged |= offsetsChanged;
void drawFrameLocked() {
if (!mVisible) {
if (DEBUG) {
Log.d(TAG, "Suppressed drawFrame since wallpaper is not visible.");

19
core/java/com/android/internal/view/BaseSurfaceHolder.java
View File

@@ -49,6 +49,7 @@ public abstract class BaseSurfaceHolder implements SurfaceHolder {
int mType = -1;
final Rect mSurfaceFrame = new Rect();
Rect mTmpDirty;
public abstract void onUpdateSurface();
public abstract void onRelayoutContainer();
@@ -171,9 +172,16 @@ public abstract class BaseSurfaceHolder implements SurfaceHolder {
Canvas c = null;
if (onAllowLockCanvas()) {
Rect frame = dirty != null ? dirty : mSurfaceFrame;
if (dirty == null) {
if (mTmpDirty == null) {
mTmpDirty = new Rect();
}
mTmpDirty.set(mSurfaceFrame);
dirty = mTmpDirty;
}
try {
c = mSurface.lockCanvas(frame);
c = mSurface.lockCanvas(dirty);
} catch (Exception e) {
Log.e(TAG, "Exception locking surface", e);
}
@@ -215,4 +223,11 @@ public abstract class BaseSurfaceHolder implements SurfaceHolder {
public Rect getSurfaceFrame() {
return mSurfaceFrame;
}
public void setSurfaceFrameSize(int width, int height) {
mSurfaceFrame.top = 0;
mSurfaceFrame.left = 0;
mSurfaceFrame.right = width;
mSurfaceFrame.bottom = height;
}
};

1
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -116,7 +116,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
private ViewGroup mContentParent;
SurfaceHolder.Callback2 mTakeSurfaceCallback;
BaseSurfaceHolder mSurfaceHolder;
InputQueue.Callback mTakeInputQueueCallback;