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

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

Merge "Move remote animation utils to the Animation lib." into main

parents b81ff578 58ec2445

packages/SystemUI/animation/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ android_library { 
        "androidx.core_core-ktx",

        "androidx.annotation_annotation",

        "SystemUIShaderLib",

        "WindowManager-Shell-shared",

        "animationlib",

    ],

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationRunnerCompat.java→packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java

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

 * Copyright (C) 2018 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.
@@ -11,10 +11,10 @@ 
 * 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

 * limitations under the License.

 */



package com.android.systemui.shared.system;

package com.android.systemui.animation;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.view.WindowManager.TRANSIT_CLOSE;

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java→packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationTargetCompat.java

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

 * Copyright (C) 2018 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.systemui.shared.system;

package com.android.systemui.animation;



import android.util.ArrayMap;

import android.view.RemoteAnimationTarget;

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+1 −1
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.keyguard.AuthKeyguardMessageArea;

import com.android.systemui.Dumpable;

import com.android.systemui.animation.ActivityTransitionAnimator;

import com.android.systemui.animation.RemoteAnimationRunnerCompat;

import com.android.systemui.display.data.repository.DisplayMetricsRepository;

import com.android.systemui.navigationbar.NavigationBarView;

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.util.Compile;

packages/SystemUI/tests/src/com/android/systemui/shared/system/RemoteTransitionTest.java

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.window.TransitionInfo; 
import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.RemoteAnimationTargetCompat;

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



import org.junit.Before;