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

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

Merge "Move some Shell utils to the Shared package." into main

parents 74d031c5 4099f342

libs/WindowManager/Shell/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -44,18 +44,10 @@ filegroup { 
filegroup {

    name: "wm_shell_util-sources",

    srcs: [

        "src/com/android/wm/shell/animation/Interpolators.java",

        "src/com/android/wm/shell/common/bubbles/*.kt",

        "src/com/android/wm/shell/common/bubbles/*.java",

        "src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt",

        "src/com/android/wm/shell/common/split/SplitScreenConstants.java",

        "src/com/android/wm/shell/common/TransactionPool.java",

        "src/com/android/wm/shell/common/TriangleShape.java",

        "src/com/android/wm/shell/common/desktopmode/*.kt",

        "src/com/android/wm/shell/draganddrop/DragAndDropConstants.java",

        "src/com/android/wm/shell/pip/PipContentOverlay.java",

        "src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java",

        "src/com/android/wm/shell/sysui/ShellSharedConstants.java",

        "src/com/android/wm/shell/util/**/*.java",

    ],

    path: "src",

libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellSharedConstants.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellSharedConstants.java

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

 * Copyright (C) 2022 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.sysui;

package com.android.wm.shell.shared;



/**

 * General shell-related constants that are shared with users of the library.

libs/WindowManager/Shell/src/com/android/wm/shell/common/TransactionPool.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/TransactionPool.java

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

 * Copyright (C) 2020 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.common;

package com.android.wm.shell.shared;



import android.util.Pools;

import android.view.SurfaceControl;

libs/WindowManager/Shell/src/com/android/wm/shell/common/TriangleShape.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/TriangleShape.java

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

 * Copyright (C) 2020 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.common;

package com.android.wm.shell.shared;



import android.graphics.Outline;

import android.graphics.Path;

libs/WindowManager/Shell/src/com/android/wm/shell/animation/Interpolators.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/Interpolators.java

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

 * Copyright (C) 2020 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.animation;

package com.android.wm.shell.shared.animation;



import android.graphics.Path;

import android.view.animation.BackGestureInterpolator;