summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorChris Li <lihongyu@google.com>2021-07-08 22:02:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-08 22:02:11 +0000
commit886a6697a8a7e8b23929c16538f19bc0f529d6ed (patch)
treec1719ddb6734860336ea92a7ab1022123920c17e /core/java
parent4128c0ad2648448258c0324acc5509274adabe89 (diff)
parent50c03ea7ed3cce5d5f87b622b772759a770d9af1 (diff)
Merge "Revert "Revert "Not show size compat UI when task is not visible""" into sc-dev am: 50c03ea7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237129 Change-Id: I96bff925796ffb4fffe341b1f47837ed947d464b
Diffstat (limited to 'core/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);
}
/**