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

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

Merge "Move Shell annotations to the shared library." into main

parents d19273d2 42e79690

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ java_library { 
    ],

    static_libs: [

        "androidx.dynamicanimation_dynamicanimation",

        "jsr330",

    ],

}

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

+34 −0
Original line number Diff line number Diff line 
package com.android.wm.shell.common.annotations;

/*

 * 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import java.lang.annotation.Documented;

import java.lang.annotation.Inherited;

libs/WindowManager/Shell/src/com/android/wm/shell/common/annotations/ExternalMainThread.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/annotations/ExternalMainThread.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.common.annotations;

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



import static java.lang.annotation.RetentionPolicy.RUNTIME;

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

+31 −0
Original line number Diff line number Diff line 
package com.android.wm.shell.common.annotations;

/*

 * 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import java.lang.annotation.Documented;

import java.lang.annotation.Inherited;

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

+31 −0
Original line number Diff line number Diff line 
package com.android.wm.shell.common.annotations;

/*

 * 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import java.lang.annotation.Documented;

import java.lang.annotation.Inherited;