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

Merge "Update shadow radius if the task has no visible children" into rvc-dev am: cf45aba44a am: 0cb398e314 am: fe848bf8f0

Browse Source 
Change-Id: I62b6db0ca7dd4bca600b10a924168fb2742eb9f6
This commit is contained in:
Vishnu Nair
2020-03-20 22:46:02 +00:00
committed by Automerger Merge Worker
parent c1293fee96 fe848bf8f0
commit 1d767ef999
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/wm/Task.java
View File

@@ -1918,7 +1918,6 @@ class Task extends WindowContainer<WindowContainer> {
super.onConfigurationChanged(newParentConfig);
if (wasInMultiWindowMode != inMultiWindowMode()) {
mStackSupervisor.scheduleUpdateMultiWindowMode(this);
updateShadowsRadius(isFocused(), getPendingTransaction());
}
final int newWinMode = getWindowingMode();
@@ -3325,6 +3324,7 @@ class Task extends WindowContainer<WindowContainer> {
}
updateSurfaceCrop();
updateShadowsRadius(isFocused(), getPendingTransaction());
if (mDimmer.updateDims(getPendingTransaction(), mTmpDimBoundsRect)) {
scheduleAnimation();
@@ -4148,27 +4148,41 @@ class Task extends WindowContainer<WindowContainer> {
return mDisplayContent.mCurrentFocus.getTask() == this;
}
/**
* @return true if the task is visible and has at least one visible child.
*/
private boolean hasVisibleChildren() {
if (!isAttached() || isForceHidden()) {
return false;
}
return getActivity(ActivityRecord::isVisible) != null;
}
/**
* @return the desired shadow radius in pixels for the current task.
*/
private float getShadowRadius(boolean taskIsFocused) {
if (mDisplayContent == null) {
int elevation = 0;
// Get elevation for a specific windowing mode.
if (inPinnedWindowingMode()) {
elevation = PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;
} else if (ENABLE_FREEFORM_COMPOSITOR_SHADOWS && inFreeformWindowingMode()) {
// TODO(b/149585281) remove when root task has the correct bounds for freeform
elevation = taskIsFocused
? DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP : DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP;
} else {
// For all other windowing modes, do not draw a shadow.
return 0;
}
if (inPinnedWindowingMode()) {
return dipToPixel(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP,
mDisplayContent.getDisplayMetrics());
}
// TODO(b/149585281) remove when root task has the correct bounds for freeform
if (ENABLE_FREEFORM_COMPOSITOR_SHADOWS && inFreeformWindowingMode()) {
final int elevation = taskIsFocused
? DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP : DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP;
return dipToPixel(elevation, mDisplayContent.getDisplayMetrics());
// If the task has no visible children, do not draw a shadow.
if (!hasVisibleChildren()) {
return 0;
}
// For all other windowing modes, do not draw a shadow.
return 0;
return dipToPixel(elevation, getDisplayContent().getDisplayMetrics());
}
/**