Merge "Clean up aconfig flag fix_dialog_launch_animation_jank_logging." into main (51b84c48) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1932,16 +1932,6 @@ flag {
		bug: "430582532"
		}

		flag {
		name: "fix_dialog_launch_animation_jank_logging"
		namespace: "systemui"
		description: "Adjust timing of jank logging for dialog launch animations, and attach it to the dialog window instead of the origin view window."
		bug: "409008342"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "animation_library_delay_leash_cleanup"
		namespace: "systemui"

+6 −23

Original line number	Diff line number	Diff line
		@@ -577,21 +577,6 @@ private class AnimatedDialog(
		private var hasInstrumentedJank = false

		fun start() {
		if (!Flags.fixDialogLaunchAnimationJankLogging()) {
		val cuj = controller.cuj
		if (cuj != null) {
		val config = controller.jankConfigurationBuilder()
		if (config != null) {
		if (cuj.tag != null) {
		config.setTag(cuj.tag)
		}

		interactionJankMonitor.begin(config)
		hasInstrumentedJank = true
		}
		}
		}

		// Create the dialog so that its onCreate() method is called, which usually sets the dialog
		// content.
		dialog.create()
		@@ -787,7 +772,6 @@ private class AnimatedDialog(
		return
		}

		if (Flags.fixDialogLaunchAnimationJankLogging()) {
		controller.cuj?.let { cuj ->
		val config =
		InteractionJankMonitor.Configuration.Builder.withView(cuj.cujType, decorView)
		@@ -795,7 +779,6 @@ private class AnimatedDialog(
		interactionJankMonitor.begin(config)
		hasInstrumentedJank = true
		}
		}

		// Show the background dim.
		dialog.window?.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)