From a67a82e08d9f4b17d6750a8c3b0d739720bf5235 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Wed, 10 Mar 2021 17:53:21 +0000 Subject: Add option in Task.getVisibleThumbnailRatio to disregard insets - Added an option to control if insets should be considered Bug: 179922117 Test: manual Change-Id: I9bbda52b9b417544338707bb53ef2568e63a6df6 --- .../com/android/systemui/shared/recents/model/Task.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java index ebb6e30d4b3b..e9e9b2421d4a 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java @@ -289,15 +289,19 @@ public class Task { /** * Returns the visible width to height ratio. Returns 0f if snapshot data is not available. */ - public float getVisibleThumbnailRatio() { + public float getVisibleThumbnailRatio(boolean clipInsets) { if (lastSnapshotData.taskSize == null || lastSnapshotData.contentInsets == null) { return 0f; } - float availableWidth = lastSnapshotData.taskSize.x - (lastSnapshotData.contentInsets.left - + lastSnapshotData.contentInsets.right); - float availableHeight = lastSnapshotData.taskSize.y - (lastSnapshotData.contentInsets.top - + lastSnapshotData.contentInsets.bottom); + float availableWidth = lastSnapshotData.taskSize.x; + float availableHeight = lastSnapshotData.taskSize.y; + if (clipInsets) { + availableWidth -= + (lastSnapshotData.contentInsets.left + lastSnapshotData.contentInsets.right); + availableHeight -= + (lastSnapshotData.contentInsets.top + lastSnapshotData.contentInsets.bottom); + } return availableWidth / availableHeight; } -- cgit v1.2.3-59-g8ed1b