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

Revert "Not show size compat UI when task is not visible"

Browse Source 
This reverts commit adb92508c0.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=coral-userdebug&lkgb=7530814&lkbb=7530923&fkbb=7530923, bug b/193105445

Bug: 193105445
Change-Id: I697229da6986d6466d7f13872e9ae7a727b80838
This commit is contained in:
Leon Jeng
2021-07-08 08:16:09 +00:00
parent 2b14f17e99
commit 76370b6fe6
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/TaskInfo.java
View File

@@ -361,8 +361,7 @@ public class TaskInfo {
&& (!topActivityInSizeCompat || configuration.windowConfiguration.getBounds() && (!topActivityInSizeCompat || configuration.windowConfiguration.getBounds()
.equals(that.configuration.windowConfiguration.getBounds())) .equals(that.configuration.windowConfiguration.getBounds()))
&& (!topActivityInSizeCompat || configuration.getLayoutDirection() && (!topActivityInSizeCompat || configuration.getLayoutDirection()
== that.configuration.getLayoutDirection()) == that.configuration.getLayoutDirection());
&& (!topActivityInSizeCompat || isVisible == that.isVisible);
} }
/** /**

2
libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java
View File

@@ -497,7 +497,7 @@ public class ShellTaskOrganizer extends TaskOrganizer {
// The task is vanished or doesn't support size compat UI, notify to remove size compat UI // The task is vanished or doesn't support size compat UI, notify to remove size compat UI
// on this Task if there is any. // on this Task if there is any.
if (taskListener == null || !taskListener.supportSizeCompatUI() if (taskListener == null || !taskListener.supportSizeCompatUI()
|| !taskInfo.topActivityInSizeCompat || !taskInfo.isVisible) { || !taskInfo.topActivityInSizeCompat) {
mSizeCompatUI.onSizeCompatInfoChanged(taskInfo.displayId, taskInfo.taskId, mSizeCompatUI.onSizeCompatInfoChanged(taskInfo.displayId, taskInfo.taskId,
null /* taskConfig */, null /* sizeCompatActivity*/, null /* taskConfig */, null /* sizeCompatActivity*/,
null /* taskListener */); null /* taskListener */);

13
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java
View File

@@ -306,23 +306,10 @@ public class ShellTaskOrganizerTests {
taskInfo2.displayId = taskInfo1.displayId; taskInfo2.displayId = taskInfo1.displayId;
taskInfo2.topActivityToken = taskInfo1.topActivityToken; taskInfo2.topActivityToken = taskInfo1.topActivityToken;
taskInfo2.topActivityInSizeCompat = true; taskInfo2.topActivityInSizeCompat = true;
taskInfo2.isVisible = true;
mOrganizer.onTaskInfoChanged(taskInfo2); mOrganizer.onTaskInfoChanged(taskInfo2);
verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId, verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,
taskInfo1.configuration, taskInfo1.topActivityToken, taskListener); taskInfo1.configuration, taskInfo1.topActivityToken, taskListener);
// Not show size compat UI if task is not visible.
clearInvocations(mSizeCompatUI);
final RunningTaskInfo taskInfo3 =
createTaskInfo(taskInfo1.taskId, taskInfo1.getWindowingMode());
taskInfo3.displayId = taskInfo1.displayId;
taskInfo3.topActivityToken = taskInfo1.topActivityToken;
taskInfo3.topActivityInSizeCompat = true;
taskInfo3.isVisible = false;
mOrganizer.onTaskInfoChanged(taskInfo3);
verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,
null /* taskConfig */, null /* sizeCompatActivity*/, null /* taskListener */);
clearInvocations(mSizeCompatUI); clearInvocations(mSizeCompatUI);
mOrganizer.onTaskVanished(taskInfo1); mOrganizer.onTaskVanished(taskInfo1);
verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId, verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,