Merge changes I9ee8bf3a,If924197c into main
* changes:
Add shell/freeformat to ktfmt directories
Apply ktfmt on shell/freeform/
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index fea2b7b..a92a543 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -18,7 +18,7 @@
tests/
tools/
bpfmt = -d
-ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI
+ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform
[Hook Scripts]
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionStarterInitializer.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionStarterInitializer.kt
index 98bdf05..c0613e2 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionStarterInitializer.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionStarterInitializer.kt
@@ -28,7 +28,7 @@
class FreeformTaskTransitionStarterInitializer(
shellInit: ShellInit,
private val windowDecorViewModel: WindowDecorViewModel,
- private val freeformTaskTransitionStarter: FreeformTaskTransitionStarter
+ private val freeformTaskTransitionStarter: FreeformTaskTransitionStarter,
) {
init {
shellInit.addInitCallback(::onShellInit, this)
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/TaskChangeListener.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/TaskChangeListener.kt
index fb86a9f..aee92ea 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/TaskChangeListener.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/TaskChangeListener.kt
@@ -24,27 +24,27 @@
* The implementations are responsible for handle all the task management.
*/
interface TaskChangeListener {
- /** Notifies a task opening in freeform mode. */
- fun onTaskOpening(taskInfo: RunningTaskInfo)
+ /** Notifies a task opening in freeform mode. */
+ fun onTaskOpening(taskInfo: RunningTaskInfo)
- /** Notifies a task info update on the given task from Shell Transitions framework. */
- fun onTaskChanging(taskInfo: RunningTaskInfo)
+ /** Notifies a task info update on the given task from Shell Transitions framework. */
+ fun onTaskChanging(taskInfo: RunningTaskInfo)
- /**
- * Notifies a task info update on the given task from [FreeformTaskListener].
- *
- * This is used to propagate task info changes since not all task changes are propagated from
- * [TransitionObserver] in [onTaskChanging]. It is recommended to use [onTaskChanging] instead of
- * this method where possible.
- */
- fun onNonTransitionTaskChanging(taskInfo: RunningTaskInfo)
+ /**
+ * Notifies a task info update on the given task from [FreeformTaskListener].
+ *
+ * This is used to propagate task info changes since not all task changes are propagated from
+ * [TransitionObserver] in [onTaskChanging]. It is recommended to use [onTaskChanging] instead
+ * of this method where possible.
+ */
+ fun onNonTransitionTaskChanging(taskInfo: RunningTaskInfo)
- /** Notifies a task moving to the front. */
- fun onTaskMovingToFront(taskInfo: RunningTaskInfo)
+ /** Notifies a task moving to the front. */
+ fun onTaskMovingToFront(taskInfo: RunningTaskInfo)
- /** Notifies a task moving to the back. */
- fun onTaskMovingToBack(taskInfo: RunningTaskInfo)
+ /** Notifies a task moving to the back. */
+ fun onTaskMovingToBack(taskInfo: RunningTaskInfo)
- /** Notifies a task is closing. */
- fun onTaskClosing(taskInfo: RunningTaskInfo)
+ /** Notifies a task is closing. */
+ fun onTaskClosing(taskInfo: RunningTaskInfo)
}