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

am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev

Browse Source 
* commit '3519530fae3584c74db294ab11814f94b966d419':
  Resize DimLayer explicitly on rotation.
This commit is contained in:
Craig Mautner
2014-02-20 22:42:56 +00:00
committed by Android Git Automerger
parent baaa080b62 3519530fae
commit 56dbf7b092
1 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
services/core/java/com/android/server/wm/DimLayer.java
View File

@ -125,12 +125,53 @@ public class DimLayer {
}
}
/**
* @param layer The new layer value.
* @param inTransaction Whether the call is made within a surface transaction.
*/
void adjustSurface(int layer, boolean inTransaction) {
final int dw, dh;
final float xPos, yPos;
if (!mStack.isFullscreen()) {
dw = mBounds.width();
dh = mBounds.height();
xPos = mBounds.left;
yPos = mBounds.top;
} else {
// Set surface size to screen size.
final DisplayInfo info = mDisplayContent.getDisplayInfo();
// Multiply by 1.5 so that rotating a frozen surface that includes this does not expose
// a corner.
dw = (int) (info.logicalWidth * 1.5);
dh = (int) (info.logicalHeight * 1.5);
// back off position so 1/4 of Surface is before and 1/4 is after.
xPos = -1 * dw / 6;
yPos = -1 * dh / 6;
}
try {
if (!inTransaction) {
SurfaceControl.openTransaction();
}
mDimSurface.setPosition(xPos, yPos);
mDimSurface.setSize(dw, dh);
mDimSurface.setLayer(layer);
} catch (RuntimeException e) {
Slog.w(TAG, "Failure setting size or layer", e);
} finally {
if (!inTransaction) {
SurfaceControl.closeTransaction();
}
}
mLastBounds.set(mBounds);
mLayer = layer;
}
// Assumes that surface transactions are currently closed.
void setBounds(Rect bounds) {
mBounds.set(bounds);
if (isDimming() && !mLastBounds.equals(bounds)) {
// Clearing mAlpha forces show to redisplay with new size.
mAlpha = 0;
show();
adjustSurface(mLayer, false);
}
}
@ -169,35 +210,8 @@ public class DimLayer {
return;
}
final int dw, dh;
final float xPos, yPos;
if (!mStack.isFullscreen()) {
dw = mBounds.width();
dh = mBounds.height();
xPos = mBounds.left;
yPos = mBounds.top;
} else {
// Set surface size to screen size.
final DisplayInfo info = mDisplayContent.getDisplayInfo();
// Multiply by 1.5 so that rotating a frozen surface that includes this does not expose a
// corner.
dw = (int) (info.logicalWidth * 1.5);
dh = (int) (info.logicalHeight * 1.5);
// back off position so 1/4 of Surface is before and 1/4 is after.
xPos = -1 * dw / 6;
yPos = -1 * dh / 6;
}
if (!mLastBounds.equals(mBounds) || mLayer != layer) {
try {
mDimSurface.setPosition(xPos, yPos);
mDimSurface.setSize(dw, dh);
mDimSurface.setLayer(layer);
} catch (RuntimeException e) {
Slog.w(TAG, "Failure setting size or layer", e);
}
mLastBounds.set(mBounds);
mLayer = layer;
adjustSurface(layer, true);
}
long curTime = SystemClock.uptimeMillis();