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

Merge "Fix fake display size when rotated." into honeycomb-mr2

Browse Source
This commit is contained in:
Dianne Hackborn
2011-05-18 15:09:58 -07:00
committed by Android (Google) Code Review
parent 07e9267d33 8f7c271ac9
commit 6ad07db7a2
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -6498,8 +6498,22 @@ public class WindowManagerService extends IWindowManager.Stub
} }
if (mBaseDisplayWidth < mInitialDisplayWidth if (mBaseDisplayWidth < mInitialDisplayWidth
|| mBaseDisplayHeight < mInitialDisplayHeight) { || mBaseDisplayHeight < mInitialDisplayHeight) {
Rect outer = new Rect(0, 0, mInitialDisplayWidth, mInitialDisplayHeight); int initW, initH, baseW, baseH;
Rect inner = new Rect(0, 0, mBaseDisplayWidth, mBaseDisplayHeight); final boolean rotated = (mRotation == Surface.ROTATION_90
|| mRotation == Surface.ROTATION_270);
if (rotated) {
initW = mInitialDisplayHeight;
initH = mInitialDisplayWidth;
baseW = mBaseDisplayHeight;
baseH = mBaseDisplayWidth;
} else {
initW = mInitialDisplayWidth;
initH = mInitialDisplayHeight;
baseW = mBaseDisplayWidth;
baseH = mBaseDisplayHeight;
}
Rect outer = new Rect(0, 0, initW, initH);
Rect inner = new Rect(0, 0, baseW, baseH);
try { try {
mBlackFrame = new BlackFrame(mFxSession, outer, inner, MASK_LAYER); mBlackFrame = new BlackFrame(mFxSession, outer, inner, MASK_LAYER);
} catch (Surface.OutOfResourcesException e) { } catch (Surface.OutOfResourcesException e) {