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

Merge "Update divider controller's dim layer when the layer is changed" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-21 22:27:51 +00:00
committed by Android (Google) Code Review
parent 729c640cc8 1402c2efe8
commit da3cd339e9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -353,7 +353,7 @@ public class DockedStackDividerController implements DimLayerUser {
stack.getDimBounds(mTmpRect); stack.getDimBounds(mTmpRect);
if (mTmpRect.height() > 0 && mTmpRect.width() > 0) { if (mTmpRect.height() > 0 && mTmpRect.width() > 0) {
mDimLayer.setBounds(mTmpRect); mDimLayer.setBounds(mTmpRect);
mDimLayer.show(mDisplayContent.mService.mLayersController.getResizeDimLayer(), mDimLayer.show(mService.mLayersController.getResizeDimLayer(),
alpha, 0 /* duration */); alpha, 0 /* duration */);
} else { } else {
visibleAndValid = false; visibleAndValid = false;
@@ -543,6 +543,9 @@ public class DockedStackDividerController implements DimLayerUser {
} else if (mAnimatingForIme) { } else if (mAnimatingForIme) {
return animateForIme(now); return animateForIme(now);
} else { } else {
if (mDimLayer != null) {
mDimLayer.setLayer(mService.mLayersController.getResizeDimLayer());
}
return false; return false;
} }
} }

3
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -119,7 +119,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
// Whether the stack and all its tasks is currently being drag-resized // Whether the stack and all its tasks is currently being drag-resized
private boolean mDragResizing; private boolean mDragResizing;
private final Rect mLastContentBounds = new Rect();
private final Rect mTmpAdjustedBounds = new Rect(); private final Rect mTmpAdjustedBounds = new Rect();
private boolean mAdjustedForIme; private boolean mAdjustedForIme;
private boolean mImeGoingAway; private boolean mImeGoingAway;
@@ -975,7 +974,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
contentBounds.bottom = imeTop; contentBounds.bottom = imeTop;
} }
mLastContentBounds.set(contentBounds);
final int yOffset = displayContentRect.bottom - contentBounds.bottom; final int yOffset = displayContentRect.bottom - contentBounds.bottom;
final int dividerWidth = final int dividerWidth =
@@ -1085,7 +1083,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
} }
if (!adjust) { if (!adjust) {
mTmpAdjustedBounds.setEmpty(); mTmpAdjustedBounds.setEmpty();
mLastContentBounds.setEmpty();
} }
setAdjustedBounds(mTmpAdjustedBounds); setAdjustedBounds(mTmpAdjustedBounds);