summaryrefslogtreecommitdiff
path: root/core/java/android/app/TaskInfo.java
diff options
context:
space:
mode:
authorChris Li <lihongyu@google.com>2021-07-08 19:07:54 +0000
committerChris Li <lihongyu@google.com>2021-07-08 12:09:40 -0700
commita23a2bb5db39571c4db209d8814c538e9cce8c6c (patch)
treefc73989e77a819a25ff525e3b8d2637d79288659 /core/java/android/app/TaskInfo.java
parent576c548b3ccc278fccb43e8fab58265d38ebff0c (diff)
Revert "Revert "Not show size compat UI when task is not visible""
This reverts commit 76370b6fe6690ee8c2fe688260607587dcc8d860. Reason for revert: Fix the merge break in ShellTaskOrganizerTests.java Fix: 193069342 Test: atest WMShellUnitTests:ShellTaskOrganizerTests Change-Id: I02c4bddc407eaac0ebb7cd5abb0b394f242d4d6e
Diffstat (limited to 'core/java/android/app/TaskInfo.java')
-rw-r--r--core/java/android/app/TaskInfo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java
index c1871be80462..444cc4eedcb1 100644
--- a/core/java/android/app/TaskInfo.java
+++ b/core/java/android/app/TaskInfo.java
@@ -353,7 +353,8 @@ public class TaskInfo {
&& (!topActivityInSizeCompat || configuration.windowConfiguration.getBounds()
.equals(that.configuration.windowConfiguration.getBounds()))
&& (!topActivityInSizeCompat || configuration.getLayoutDirection()
- == that.configuration.getLayoutDirection());
+ == that.configuration.getLayoutDirection())
+ && (!topActivityInSizeCompat || isVisible == that.isVisible);
}
/**