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

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

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

parents 48d4c0a1 a8091db7

libs/WindowManager/Shell/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ filegroup { 
    srcs: [

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

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

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

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

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

    ],

    path: "src",

}
@@ -208,6 +205,7 @@ android_library { 
        // TODO(b/168581922) protologtool do not support kotlin(*.kt)

        ":wm_shell-sources-kt",

        ":wm_shell-aidls",

        ":wm_shell-shared-aidls",

    ],

    resource_dirs: [

        "res",

libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.aidl→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.aidl

+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,6 +14,6 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.util;

package com.android.wm.shell.shared;



parcelable GroupedRecentTaskInfo;
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.java

+4 −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.util;

package com.android.wm.shell.shared;



import android.annotation.IntDef;

import android.app.ActivityManager;
@@ -25,6 +25,8 @@ import android.os.Parcelable; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.wm.shell.shared.split.SplitBounds;



import java.util.Arrays;

import java.util.List;

import java.util.Set;

libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.aidl→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl

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

 */



package com.android.wm.shell.common.desktopmode;

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



parcelable DesktopModeTransitionSource;
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.kt→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt

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

 */



package com.android.wm.shell.common.desktopmode

package com.android.wm.shell.shared.desktopmode



import android.os.Parcel

import android.os.Parcelable