Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16230f4a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I9ee8bf3a,If924197c into main 

* changes:
  Add shell/freeformat to ktfmt directories
  Apply ktfmt on shell/freeform/
parents 8e98c85f daa0f7bc

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               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}

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionStarterInitializer.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.wm.shell.windowdecor.WindowDecorViewModel 
class FreeformTaskTransitionStarterInitializer(

    shellInit: ShellInit,

    private val windowDecorViewModel: WindowDecorViewModel,

    private val freeformTaskTransitionStarter: FreeformTaskTransitionStarter

    private val freeformTaskTransitionStarter: FreeformTaskTransitionStarter,

) {

    init {

        shellInit.addInitCallback(::onShellInit, this)

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/TaskChangeListener.kt

+18 −18
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ interface TaskChangeListener { 
     * 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.

     * [TransitionObserver] in [onTaskChanging]. It is recommended to use [onTaskChanging] instead

     * of this method where possible.

     */

    fun onNonTransitionTaskChanging(taskInfo: RunningTaskInfo)