Merge "Jank-Instrument all dialogs opened from the shade" into tm-qpr-dev (d151838b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,7 @@ import com.android.internal.R;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.internal.colorextraction.ColorExtractor;		import com.android.internal.colorextraction.ColorExtractor;
	import com.android.internal.colorextraction.ColorExtractor.GradientColors;		import com.android.internal.colorextraction.ColorExtractor.GradientColors;
			import com.android.internal.jank.InteractionJankMonitor;
	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.UiEvent;		import com.android.internal.logging.UiEvent;
	import com.android.internal.logging.UiEventLogger;		import com.android.internal.logging.UiEventLogger;
	@@ -110,6 +111,7 @@ import com.android.internal.widget.LockPatternUtils;
	import com.android.keyguard.KeyguardUpdateMonitor;		import com.android.keyguard.KeyguardUpdateMonitor;
	import com.android.systemui.MultiListLayout;		import com.android.systemui.MultiListLayout;
	import com.android.systemui.MultiListLayout.MultiListAdapter;		import com.android.systemui.MultiListLayout.MultiListAdapter;
			import com.android.systemui.animation.DialogCuj;
	import com.android.systemui.animation.DialogLaunchAnimator;		import com.android.systemui.animation.DialogLaunchAnimator;
	import com.android.systemui.animation.Interpolators;		import com.android.systemui.animation.Interpolators;
	import com.android.systemui.broadcast.BroadcastDispatcher;		import com.android.systemui.broadcast.BroadcastDispatcher;
	@@ -154,6 +156,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene

	private static final String TAG = "GlobalActionsDialogLite";		private static final String TAG = "GlobalActionsDialogLite";

			private static final String INTERACTION_JANK_TAG = "global_actions";

	private static final boolean SHOW_SILENT_TOGGLE = true;		private static final boolean SHOW_SILENT_TOGGLE = true;

	/* Valid settings for global actions keys.		/* Valid settings for global actions keys.
	@@ -499,7 +503,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
	mDialog.getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM);		mDialog.getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM);

	if (view != null) {		if (view != null) {
	mDialogLaunchAnimator.showFromView(mDialog, view);		mDialogLaunchAnimator.showFromView(mDialog, view,
			new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
			INTERACTION_JANK_TAG));
	} else {		} else {
	mDialog.show();		mDialog.show();
	}		}

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt

+15 −4

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,10 @@ import android.content.Context
	import android.media.AudioManager		import android.media.AudioManager
	import android.media.session.MediaSessionManager		import android.media.session.MediaSessionManager
	import android.view.View		import android.view.View
			import com.android.internal.jank.InteractionJankMonitor
	import com.android.internal.logging.UiEventLogger		import com.android.internal.logging.UiEventLogger
	import com.android.settingslib.bluetooth.LocalBluetoothManager		import com.android.settingslib.bluetooth.LocalBluetoothManager
			import com.android.systemui.animation.DialogCuj
	import com.android.systemui.animation.DialogLaunchAnimator		import com.android.systemui.animation.DialogLaunchAnimator
	import com.android.systemui.broadcast.BroadcastSender		import com.android.systemui.broadcast.BroadcastSender
	import com.android.systemui.media.nearby.NearbyMediaDevicesManager		import com.android.systemui.media.nearby.NearbyMediaDevicesManager
	@@ -46,6 +48,7 @@ class MediaOutputDialogFactory @Inject constructor(
	private val audioManager: AudioManager		private val audioManager: AudioManager
	) {		) {
	companion object {		companion object {
			private const val INTERACTION_JANK_TAG = "media_output"
	var mediaOutputDialog: MediaOutputDialog? = null		var mediaOutputDialog: MediaOutputDialog? = null
	}		}

	@@ -54,16 +57,24 @@ class MediaOutputDialogFactory @Inject constructor(
	// Dismiss the previous dialog, if any.		// Dismiss the previous dialog, if any.
	mediaOutputDialog?.dismiss()		mediaOutputDialog?.dismiss()

	val controller = MediaOutputController(context, packageName,		val controller = MediaOutputController(
			context, packageName,
	mediaSessionManager, lbm, starter, notifCollection,		mediaSessionManager, lbm, starter, notifCollection,
	dialogLaunchAnimator, nearbyMediaDevicesManagerOptional, audioManager)		dialogLaunchAnimator, nearbyMediaDevicesManagerOptional, audioManager
			)
	val dialog =		val dialog =
	MediaOutputDialog(context, aboveStatusBar, broadcastSender, controller, uiEventLogger)		MediaOutputDialog(context, aboveStatusBar, broadcastSender, controller, uiEventLogger)
	mediaOutputDialog = dialog		mediaOutputDialog = dialog

	// Show the dialog.		// Show the dialog.
	if (view != null) {		if (view != null) {
	dialogLaunchAnimator.showFromView(dialog, view)		dialogLaunchAnimator.showFromView(
			dialog, view,
			cuj = DialogCuj(
			InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
			INTERACTION_JANK_TAG
			)
			)
	} else {		} else {
	dialog.show()		dialog.show()
	}		}

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+7 −1

packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,8 +45,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
	import androidx.recyclerview.widget.RecyclerView		import androidx.recyclerview.widget.RecyclerView
	import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED
	import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_FOOTER_DOT		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_FOOTER_DOT
			import com.android.internal.jank.InteractionJankMonitor
	import com.android.systemui.Dumpable		import com.android.systemui.Dumpable
	import com.android.systemui.R		import com.android.systemui.R
			import com.android.systemui.animation.DialogCuj
	import com.android.systemui.animation.DialogLaunchAnimator		import com.android.systemui.animation.DialogLaunchAnimator
	import com.android.systemui.broadcast.BroadcastDispatcher		import com.android.systemui.broadcast.BroadcastDispatcher
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	@@ -81,6 +83,7 @@ class FgsManagerController @Inject constructor(
	) : IForegroundServiceObserver.Stub(), Dumpable {		) : IForegroundServiceObserver.Stub(), Dumpable {

	companion object {		companion object {
			private const val INTERACTION_JANK_TAG = "active_background_apps"
	private val LOG_TAG = FgsManagerController::class.java.simpleName		private val LOG_TAG = FgsManagerController::class.java.simpleName
	private const val DEFAULT_TASK_MANAGER_ENABLED = true		private const val DEFAULT_TASK_MANAGER_ENABLED = true
	private const val DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT = false		private const val DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT = false
	@@ -311,7 +314,15 @@ class FgsManagerController @Inject constructor(

	mainExecutor.execute {		mainExecutor.execute {
	viewLaunchedFrom		viewLaunchedFrom
	?.let { dialogLaunchAnimator.showFromView(dialog, it) } ?: dialog.show()		?.let {
			dialogLaunchAnimator.showFromView(
			dialog, it,
			cuj = DialogCuj(
			InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
			INTERACTION_JANK_TAG
			)
			)
			} ?: dialog.show()
	}		}

	backgroundExecutor.execute {		backgroundExecutor.execute {

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,9 +80,11 @@ import android.widget.TextView;
	import androidx.annotation.Nullable;		import androidx.annotation.Nullable;
	import androidx.annotation.VisibleForTesting;		import androidx.annotation.VisibleForTesting;

			import com.android.internal.jank.InteractionJankMonitor;
	import com.android.internal.util.FrameworkStatsLog;		import com.android.internal.util.FrameworkStatsLog;
	import com.android.systemui.FontSizeUtils;		import com.android.systemui.FontSizeUtils;
	import com.android.systemui.R;		import com.android.systemui.R;
			import com.android.systemui.animation.DialogCuj;
	import com.android.systemui.animation.DialogLaunchAnimator;		import com.android.systemui.animation.DialogLaunchAnimator;
	import com.android.systemui.broadcast.BroadcastDispatcher;		import com.android.systemui.broadcast.BroadcastDispatcher;
	import com.android.systemui.dagger.qualifiers.Background;		import com.android.systemui.dagger.qualifiers.Background;
	@@ -108,6 +110,8 @@ class QSSecurityFooter extends ViewController<View>
	protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);		protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
	private static final boolean DEBUG_FORCE_VISIBLE = false;		private static final boolean DEBUG_FORCE_VISIBLE = false;

			private static final String INTERACTION_JANK_TAG = "managed_device_info";

	private final TextView mFooterText;		private final TextView mFooterText;
	private final ImageView mPrimaryFooterIcon;		private final ImageView mPrimaryFooterIcon;
	private Context mContext;		private Context mContext;
	@@ -557,7 +561,8 @@ class QSSecurityFooter extends ViewController<View>

	mDialog.setView(view);		mDialog.setView(view);
	if (mView.isAggregatedVisible()) {		if (mView.isAggregatedVisible()) {
	mDialogLaunchAnimator.showFromView(mDialog, mView);		mDialogLaunchAnimator.showFromView(mDialog, mView, new DialogCuj(
			InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG));
	} else {		} else {
	mDialog.show();		mDialog.show();
	}		}