Merge "Update layers after reorder operations" into main (437d1045) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowOrganizerController.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -1471,7 +1471,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		final int index = task.mChildren.indexOf(topTaskFragment);
		task.mChildren.remove(taskFragment);
		task.mChildren.add(index, taskFragment);
		if (taskFragment.hasChild()) {
		effects \|= TRANSACT_EFFECTS_LIFECYCLE;
		} else {
		// Ensure that the child layers are updated if the TaskFragment is empty
		task.assignChildLayers();
		}
		}
		}
		break;
		@@ -1486,7 +1491,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		if (task != null) {
		task.mChildren.remove(taskFragment);
		task.mChildren.add(0, taskFragment);
		if (taskFragment.hasChild()) {
		effects \|= TRANSACT_EFFECTS_LIFECYCLE;
		} else {
		// Ensure that the child layers are updated if the TaskFragment is empty.
		task.assignChildLayers();
		}
		}
		break;
		}
		@@ -1495,7 +1505,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		if (task != null) {
		task.mChildren.remove(taskFragment);
		task.mChildren.add(taskFragment);
		if (taskFragment.hasChild()) {
		effects \|= TRANSACT_EFFECTS_LIFECYCLE;
		} else {
		// Ensure that the child layers are updated if the TaskFragment is empty.
		task.assignChildLayers();
		}
		}
		break;
		}