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

Commit 38b252ba authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary copy of transition adapter utils." into udc-dev am:... 

Merge "Remove unnecessary copy of transition adapter utils." into udc-dev am: 7d68bdc4 am: 2d59b3e4 am: 3eadaa8a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23251361



Change-Id: Ibc285054b61b7d2b79a81e37f8938187e16586a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef8e801d 3eadaa8a

libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java

+1 −2
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; 
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;
@@ -312,6 +310,7 @@ public class TransitionUtil { 
        target.setWillShowImeOnTarget(

                (change.getFlags() & TransitionInfo.FLAG_WILL_IME_SHOWN) != 0);

        target.setRotationChange(change.getEndRotation() - change.getStartRotation());

        target.backgroundColor = change.getBackgroundColor();

        return target;

    }

packages/SystemUI/animation/src/com/android/systemui/animation/RemoteTransitionAdapter.kt

deleted100644 → 0
+0 −455

File deleted.

Preview size limit exceeded, changes collapsed.

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

+39 −15

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.KeyEvent; 
import android.view.RemoteAnimationAdapter;

import android.view.View;

import android.view.ViewGroup;

import android.window.RemoteTransition;

import android.window.SplashScreen;



import androidx.annotation.NonNull;
@@ -43,7 +44,6 @@ import com.android.internal.statusbar.RegisterStatusBarResult; 
import com.android.keyguard.AuthKeyguardMessageArea;

import com.android.systemui.Dumpable;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.RemoteTransitionAdapter;

import com.android.systemui.navigationbar.NavigationBarView;

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

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;
@@ -52,6 +52,7 @@ import com.android.systemui.qs.QSPanelController; 
import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.NotificationShadeWindowViewController;

import com.android.systemui.shade.ShadeViewController;

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

import com.android.systemui.statusbar.LightRevealScrim;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -160,8 +161,9 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
        if (animationAdapter != null) {

            if (ENABLE_SHELL_TRANSITIONS) {

                options = ActivityOptions.makeRemoteTransition(

                        RemoteTransitionAdapter.adaptRemoteAnimation(animationAdapter,

                                "SysUILaunch"));

                        new RemoteTransition(

                                RemoteAnimationRunnerCompat.wrap(animationAdapter.getRunner()),

                                animationAdapter.getCallingApplication(), "SysUILaunch"));

            } else {

                options = ActivityOptions.makeRemoteAnimation(animationAdapter);

            }