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

Commit c4debd5e authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1 

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



Change-Id: I5f5e322e71bad97f575399d4e18bca84a15cade8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77a42408 5f5aa7e1

core/java/com/android/internal/jank/InteractionJankMonitor.java

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TAKE_SCREENSHOT;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_SWITCH;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WALLPAPER_TRANSITION;



import android.annotation.IntDef;
@@ -196,6 +197,7 @@ public class InteractionJankMonitor { 
    public static final int CUJ_SPLIT_SCREEN_RESIZE = 52;

    public static final int CUJ_SETTINGS_SLIDER = 53;

    public static final int CUJ_TAKE_SCREENSHOT = 54;

    public static final int CUJ_VOLUME_CONTROL = 55;



    private static final int NO_STATSD_LOGGING = -1;
@@ -259,6 +261,7 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_RESIZE,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SETTINGS_SLIDER,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TAKE_SCREENSHOT,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -334,6 +337,7 @@ public class InteractionJankMonitor { 
            CUJ_SPLIT_SCREEN_RESIZE,

            CUJ_SETTINGS_SLIDER,

            CUJ_TAKE_SCREENSHOT,

            CUJ_VOLUME_CONTROL,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -762,6 +766,8 @@ public class InteractionJankMonitor { 
                return "SETTINGS_SLIDER";

            case CUJ_TAKE_SCREENSHOT:

                return "TAKE_SCREENSHOT";

            case CUJ_VOLUME_CONTROL:

                return "VOLUME_CONTROL";

        }

        return "UNKNOWN";

    }

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+55 −3
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import static android.view.View.LAYOUT_DIRECTION_RTL; 
import static android.view.View.VISIBLE;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_VOLUME_CONTROL;

import static com.android.internal.jank.InteractionJankMonitor.Configuration.Builder;

import static com.android.systemui.volume.Events.DISMISS_REASON_SETTINGS_CLICKED;



import android.animation.Animator;
@@ -68,6 +70,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;

import android.os.SystemClock;

import android.os.Trace;

import android.os.VibrationEffect;

import android.provider.Settings;

import android.provider.Settings.Global;
@@ -101,9 +104,11 @@ import android.widget.SeekBar.OnSeekBarChangeListener; 
import android.widget.TextView;

import android.widget.Toast;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.graphics.drawable.BackgroundBlurDrawable;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.view.RotationPolicy;

import com.android.settingslib.Utils;

import com.android.systemui.Prefs;
@@ -149,6 +154,13 @@ public class VolumeDialogImpl implements VolumeDialog, 
    private static final int DRAWER_ANIMATION_DURATION_SHORT = 175;

    private static final int DRAWER_ANIMATION_DURATION = 250;



    /** Shows volume dialog show animation. */

    private static final String TYPE_SHOW = "show";

    /** Dismiss volume dialog animation.  */

    private static final String TYPE_DISMISS = "dismiss";

    /** Volume dialog slider animation. */

    private static final String TYPE_UPDATE = "update";



    private final int mDialogShowAnimationDurationMs;

    private final int mDialogHideAnimationDurationMs;

    private int mDialogWidth;
@@ -258,6 +270,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
    private final boolean mUseBackgroundBlur;

    private Consumer<Boolean> mCrossWindowBlurEnabledListener;

    private BackgroundBlurDrawable mDialogRowsViewBackground;

    private final InteractionJankMonitor mInteractionJankMonitor;



    public VolumeDialogImpl(

            Context context,
@@ -266,7 +279,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
            DeviceProvisionedController deviceProvisionedController,

            ConfigurationController configurationController,

            MediaOutputDialogFactory mediaOutputDialogFactory,

            ActivityStarter activityStarter) {

            ActivityStarter activityStarter,

            InteractionJankMonitor interactionJankMonitor) {

        mContext =

                new ContextThemeWrapper(context, R.style.volume_dialog_theme);

        mController = volumeDialogController;
@@ -290,6 +304,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
            mContext.getResources().getInteger(R.integer.config_dialogHideAnimationDurationMs);

        mUseBackgroundBlur =

            mContext.getResources().getBoolean(R.bool.config_volumeDialogUseBackgroundBlur);

        mInteractionJankMonitor = interactionJankMonitor;



        if (mUseBackgroundBlur) {

            final int dialogRowsViewColorAboveBlur = mContext.getColor(
@@ -422,6 +437,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
                    .alpha(1)

                    .translationX(0)

                    .setDuration(mDialogShowAnimationDurationMs)

                    .setListener(getJankListener(getDialogView(), TYPE_SHOW, DIALOG_TIMEOUT_MILLIS))

                    .setInterpolator(new SystemUIInterpolators.LogDecelerateInterpolator())

                    .withEndAction(() -> {

                        if (!Prefs.getBoolean(mContext, Prefs.Key.TOUCHED_RINGER_TOGGLE, false)) {
@@ -1251,7 +1267,33 @@ public class VolumeDialogImpl implements VolumeDialog, 
        mHandler.obtainMessage(H.DISMISS, reason, 0).sendToTarget();

    }



    private Animator.AnimatorListener getJankListener(View v, String type, long timeout) {

        return new Animator.AnimatorListener() {

            @Override

            public void onAnimationStart(@NonNull Animator animation) {

                mInteractionJankMonitor.begin(Builder.withView(CUJ_VOLUME_CONTROL, v).setTag(type)

                        .setTimeout(timeout));

            }



            @Override

            public void onAnimationEnd(@NonNull Animator animation) {

                mInteractionJankMonitor.end(CUJ_VOLUME_CONTROL);

            }



            @Override

            public void onAnimationCancel(@NonNull Animator animation) {

                mInteractionJankMonitor.cancel(CUJ_VOLUME_CONTROL);

            }



            @Override

            public void onAnimationRepeat(@NonNull Animator animation) {

                // no-op

            }

        };

    }



    private void showH(int reason) {

        Trace.beginSection("VolumeDialogImpl#showH");

        if (D.BUG) Log.d(TAG, "showH r=" + Events.SHOW_REASONS[reason]);

        mHandler.removeMessages(H.SHOW);

        mHandler.removeMessages(H.DISMISS);
@@ -1272,6 +1314,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
        mController.getCaptionsComponentState(false);

        checkODICaptionsTooltip(false);

        updateBackgroundForDrawerClosedAmount();

        Trace.endSection();

    }



    protected void rescheduleTimeoutH() {
@@ -1305,6 +1348,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
    }



    protected void dismissH(int reason) {

        Trace.beginSection("VolumeDialogImpl#dismissH");

        if (D.BUG) {

            Log.d(TAG, "mDialog.dismiss() reason: " + Events.DISMISS_REASONS[reason]

                    + " from: " + Debug.getCaller());
@@ -1335,7 +1379,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                    hideRingerDrawer();

                }, 50));

        if (!shouldSlideInVolumeTray()) animator.translationX(mDialogView.getWidth() / 2.0f);

        animator.start();

        animator.setListener(getJankListener(getDialogView(), TYPE_DISMISS,

                mDialogHideAnimationDurationMs)).start();

        checkODICaptionsTooltip(true);

        mController.notifyVisible(false);

        synchronized (mSafetyWarningLock) {
@@ -1344,6 +1389,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
                mSafetyWarning.dismiss();

            }

        }

        Trace.endSection();

    }



    private boolean showActiveStreamOnly() {
@@ -1383,6 +1429,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
    }



    private void updateRowsH(final VolumeRow activeRow) {

        Trace.beginSection("VolumeDialogImpl#updateRowsH");

        if (D.BUG) Log.d(TAG, "updateRowsH");

        if (!mShowing) {

            trimObsoleteH();
@@ -1446,6 +1493,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
        }



        updateBackgroundForDrawerClosedAmount();

        Trace.endSection();

    }



    protected void updateRingerH() {
@@ -1730,7 +1778,9 @@ public class VolumeDialogImpl implements VolumeDialog, 
        final boolean enableSlider = !zenMuted;

        final int vlevel = row.ss.muted && (!isRingStream && !zenMuted) ? 0

                : row.ss.level;

        Trace.beginSection("VolumeDialogImpl#updateVolumeRowSliderH");

        updateVolumeRowSliderH(row, enableSlider, vlevel);

        Trace.endSection();

        if (row.number != null) row.number.setText(Integer.toString(vlevel));

    }
@@ -1824,6 +1874,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                }

                row.animTargetProgress = newProgress;

                row.anim.setDuration(UPDATE_ANIMATION_DURATION);

                row.anim.addListener(

                        getJankListener(row.view, TYPE_UPDATE, UPDATE_ANIMATION_DURATION));

                row.anim.start();

            } else {

                // update slider directly to clamped value

packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java

+5 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.volume.dagger; 
import android.content.Context;

import android.media.AudioManager;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.VolumeDialog;
@@ -51,7 +52,8 @@ public interface VolumeModule { 
            DeviceProvisionedController deviceProvisionedController,

            ConfigurationController configurationController,

            MediaOutputDialogFactory mediaOutputDialogFactory,

            ActivityStarter activityStarter) {

            ActivityStarter activityStarter,

            InteractionJankMonitor interactionJankMonitor) {

        VolumeDialogImpl impl = new VolumeDialogImpl(

                context,

                volumeDialogController,
@@ -59,7 +61,8 @@ public interface VolumeModule { 
                deviceProvisionedController,

                configurationController,

                mediaOutputDialogFactory,

                activityStarter);

                activityStarter,

                interactionJankMonitor);

        impl.setStreamImportant(AudioManager.STREAM_SYSTEM, false);

        impl.setAutomute(true);

        impl.setSilentMode(false);

packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java

+5 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.view.accessibility.AccessibilityManager; 


import androidx.test.filters.SmallTest;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;
@@ -85,6 +86,8 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
    MediaOutputDialogFactory mMediaOutputDialogFactory;

    @Mock

    ActivityStarter mActivityStarter;

    @Mock

    InteractionJankMonitor mInteractionJankMonitor;



    @Before

    public void setup() throws Exception {
@@ -99,7 +102,8 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
                mDeviceProvisionedController,

                mConfigurationController,

                mMediaOutputDialogFactory,

                mActivityStarter);

                mActivityStarter,

                mInteractionJankMonitor);

        mDialog.init(0, null);

        State state = createShellState();

        mDialog.onStateChangedH(state);