Merge "Clean up launched contextual tip flags." into main (687b6aaa) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −31

Original line number	Diff line number	Diff line
		@@ -824,20 +824,6 @@ flag {
		bug: "278086361"
		}

		flag {
		name: "enable_contextual_tip_for_power_off"
		namespace: "systemui"
		description: "Enables on-screen contextual tip about how to power off or restart phone"
		bug: "322891421"
		}

		flag {
		name: "enable_contextual_tip_for_take_screenshot"
		namespace: "systemui"
		description: "Enables on-screen contextual tip about how to take screenshot."
		bug: "322891421"
		}

		flag {
		name: "enable_contextual_tip_for_mute_volume"
		namespace: "systemui"
		@@ -859,23 +845,6 @@ flag {
		bug: "322891421"
		}

		flag {
		name: "enable_contextual_tips"
		description: "Enables showing contextual tips."
		namespace: "systemui"
		bug: "322891421"
		}

		flag {
		name: "contextual_tips_assistant_dismiss_fix"
		namespace: "systemui"
		description: "Improve assistant dismiss signal accuracy for contextual tips."
		bug: "334759504"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "shaderlib_loading_effect_refactor"
		namespace: "systemui"

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package com.android.systemui.assist.domain.interactor

		import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		@@ -39,7 +37,6 @@ class AssistInteractorTest : SysuiTestCase() {
		private val underTest = kosmos.assistInteractor

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_CONTEXTUAL_TIPS, Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_POWER_OFF)
		fun onAssistantStarted() =
		testScope.runTest {
		val invocationType by collectLastValue(underTest.latestInvocationType)

+2 −9

Original line number	Diff line number	Diff line
		@@ -16,25 +16,18 @@

		package com.android.systemui.assist.domain.interactor

		import com.android.systemui.Flags
		import com.android.systemui.assist.data.repository.AssistRepository
		import com.android.systemui.dagger.SysUISingleton
		import javax.inject.Inject
		import kotlinx.coroutines.flow.SharedFlow

		@SysUISingleton
		class AssistInteractor
		@Inject
		constructor(
		private val repository: AssistRepository,
		) {
		class AssistInteractor @Inject constructor(private val repository: AssistRepository) {
		/** The type of the latest invocation of the assistant. */
		val latestInvocationType: SharedFlow<Int> = repository.latestInvocationType

		/** Notifies that Assistant has been started. */
		fun onAssistantStarted(type: Int) {
		if (Flags.enableContextualTips() && Flags.enableContextualTipForPowerOff()) {
		repository.setLatestInvocationType(type)
		}
		}
		}