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

Commit c956e483 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Move interfaces to the shared library." into main

parents b5cbedd0 a8aca21f

libs/WindowManager/Shell/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -165,12 +165,23 @@ java_library { 
    },

}



filegroup {

    name: "wm_shell-shared-aidls",



    srcs: [

        "shared/**/*.aidl",

    ],



    path: "shared/src",

}



java_library {

    name: "WindowManager-Shell-shared",



    srcs: [

        "shared/**/*.java",

        "shared/**/*.kt",

        ":wm_shell-shared-aidls",

    ],

    static_libs: [

        "androidx.dynamicanimation_dynamicanimation",

libs/WindowManager/Shell/src/com/android/wm/shell/transition/IHomeTransitionListener.aidl→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/IHomeTransitionListener.aidl

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.transition;

package com.android.wm.shell.shared;



import android.window.RemoteTransition;

import android.window.TransitionFilter;

libs/WindowManager/Shell/src/com/android/wm/shell/transition/IShellTransitions.aidl→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/IShellTransitions.aidl

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.transition;

package com.android.wm.shell.shared;



import android.view.SurfaceControl;

import android.window.RemoteTransition;

import android.window.TransitionFilter;



import com.android.wm.shell.transition.IHomeTransitionListener;

import com.android.wm.shell.shared.IHomeTransitionListener;



/**

 * Interface that is exposed to remote callers to manipulate the transitions feature.

libs/WindowManager/Shell/src/com/android/wm/shell/transition/ShellTransitions.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellTransitions.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.transition;

package com.android.wm.shell.shared;



import android.annotation.NonNull;

import android.window.RemoteTransition;

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+1 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import com.android.wm.shell.performance.PerfHintController; 
import com.android.wm.shell.recents.RecentTasks;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;

import com.android.wm.shell.shared.ShellTransitions;

import com.android.wm.shell.shared.annotations.ShellAnimationThread;

import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

import com.android.wm.shell.shared.annotations.ShellMainThread;
@@ -106,7 +107,6 @@ import com.android.wm.shell.taskview.TaskViewFactory; 
import com.android.wm.shell.taskview.TaskViewFactoryController;

import com.android.wm.shell.taskview.TaskViewTransitions;

import com.android.wm.shell.transition.HomeTransitionObserver;

import com.android.wm.shell.transition.ShellTransitions;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.unfold.ShellUnfoldProgressProvider;

import com.android.wm.shell.unfold.UnfoldAnimationController;