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

Commit 60d0b1f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cuj-sysui-launches" into sc-dev am: b538b60e 

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

Change-Id: I3a4e691e291bd353b88d85e8ccbc0576e06b0c05
parents 04eed855 b538b60e

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

+3 −1
Original line number Diff line number Diff line
@@ -238,7 +238,9 @@ class ActivityLaunchAnimator( 
             * during the animation.

             */

            @JvmStatic

            fun fromView(view: View): Controller = GhostedViewLaunchAnimatorController(view)

            fun fromView(view: View, cujType: Int? = null): Controller {

                return GhostedViewLaunchAnimatorController(view, cujType)

            }

        }



        /**

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

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import android.view.View 
import android.view.ViewGroup

import android.view.ViewGroupOverlay

import android.widget.FrameLayout

import com.android.internal.jank.InteractionJankMonitor

import kotlin.math.min



/**
@@ -29,7 +30,10 @@ import kotlin.math.min 
 */

open class GhostedViewLaunchAnimatorController(

    /** The view that will be ghosted and from which the background will be extracted. */

    private val ghostedView: View

    private val ghostedView: View,



    /** The [InteractionJankMonitor.CujType] associated to this animation. */

    private val cujType: Int? = null

) : ActivityLaunchAnimator.Controller {

    /** The container to which we will add the ghost view and expanding background. */

    override var launchContainer = ghostedView.rootView as ViewGroup
@@ -125,6 +129,8 @@ open class GhostedViewLaunchAnimatorController( 


        val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX

        matrix.getValues(initialGhostViewMatrixValues)



        cujType?.let { InteractionJankMonitor.getInstance().begin(ghostedView, it) }

    }



    override fun onLaunchAnimationProgress(
@@ -167,6 +173,8 @@ open class GhostedViewLaunchAnimatorController( 
    }



    override fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) {

        cujType?.let { InteractionJankMonitor.getInstance().end(it) }



        backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha



        GhostView.removeGhost(ghostedView)

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.annotation.Nullable; 
import androidx.annotation.UiThread;

import androidx.constraintlayout.widget.ConstraintSet;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.settingslib.widget.AdaptiveIcon;

import com.android.systemui.R;

import com.android.systemui.animation.ActivityLaunchAnimator;
@@ -468,7 +469,8 @@ public class MediaControlPanel { 
            TransitionLayout player) {

        // TODO(b/174236650): Make sure that the carousel indicator also fades out.

        // TODO(b/174236650): Instrument the animation to measure jank.

        return new GhostedViewLaunchAnimatorController(player) {

        return new GhostedViewLaunchAnimatorController(player,

                InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_MEDIA_PLAYER) {

            @Override

            protected float getCurrentTopCornerRadius() {

                return ((IlluminationDrawable) player.getBackground()).getCornerRadius();

packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.View; 
import android.widget.TextView;

import android.widget.Toast;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto;
@@ -272,7 +273,8 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
    private void startSettingsActivity() {

        ActivityLaunchAnimator.Controller animationController =

                mSettingsButtonContainer != null ? ActivityLaunchAnimator.Controller.fromView(

                        mSettingsButtonContainer) : null;

                        mSettingsButtonContainer,

                        InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON) : null;

        mActivityStarter.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS),

                true /* dismissShade */, animationController);

    }

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.lifecycle.LifecycleOwner; 
import androidx.lifecycle.LifecycleRegistry;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.InstanceId;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;
@@ -389,7 +390,8 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy 
     */

    protected void handleLongClick(@Nullable View view) {

        ActivityLaunchAnimator.Controller animationController =

                view != null ? ActivityLaunchAnimator.Controller.fromView(view) : null;

                view != null ? ActivityLaunchAnimator.Controller.fromView(view,

                        InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_QS_TILE) : null;

        mActivityStarter.postStartActivityDismissingKeyguard(getLongClickIntent(), 0,

                animationController);

    }