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

Commit 6619010f authored Oct 19, 2023 by fayey Committed by Faye Yan Nov 02, 2023

Add Voice activation apps into Settings->Apps->Special app access

This change is flag controlled by
`com.android.settings.flags.enable_voice_activation_apps_in_settings`.

Bug: 306447565
Bug: 303727896
Test: atest com.android.settings.spa.app.specialaccess.VoiceActivationAppsTest
Test: atest com.android.settings.spa.app.specialaccess.VoiceActivationAppsPreferenceControllerTest
Test: manual Settings CUJs
Change-Id: I71a0dc2303263c9957220b56e4dcacec9a561b02

parent c7c82de7

res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -9520,6 +9520,13 @@
		<!-- Label for showing apps that can manage external storage[CHAR LIMIT=45] -->
		<string name="filter_manage_external_storage">Can access all files</string>

		<!-- Voice Activation apps settings title [CHAR LIMIT=40] -->
		<string name="voice_activation_apps_title">Voice activation apps</string>
		<!-- Label for a setting which controls whether an app can be voice activated [CHAR LIMIT=NONE] -->
		<string name="permit_voice_activation_apps">Allow voice activation</string>
		<!-- Description for a setting which controls whether an app can be voice activated [CHAR LIMIT=NONE] -->
		<string name ="allow_voice_activation_apps_description">Voice activation turns-on approved apps, hands-free, using voice command.\n\nUntill activated, none of these apps can directly access your microphone.Instead, this device uses built-in proteced adaptive sensing to turn-on aprroved apps for you.\n\n<a href="">More about protected adaptive sensing</a></string>

		<!-- Manage full screen intent permission title [CHAR LIMIT=40] -->
		<string name="full_screen_intent_title">Full screen notifications</string>

res/xml/special_access.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,11 @@
		android:title="@string/full_screen_intent_title"
		settings:controller="com.android.settings.spa.app.specialaccess.UseFullScreenIntentPreferenceController" />

		<Preference
		android:key="voice_activation_apps"
		android:title="@string/voice_activation_apps_title"
		settings:controller="com.android.settings.spa.app.specialaccess.VoiceActivationAppsPreferenceController" />

		<Preference
		android:key="picture_in_picture"
		android:title="@string/picture_in_picture_title"

src/com/android/settings/SettingsActivityUtil.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import com.android.settings.spa.app.specialaccess.MediaManagementAppsAppListProv
		import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider
		import com.android.settings.spa.app.specialaccess.NfcTagAppsSettingsProvider
		import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider
		import com.android.settings.spa.app.specialaccess.VoiceActivationAppsListProvider
		import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider
		import com.android.settings.wifi.ChangeWifiStateDetails

		@@ -65,6 +66,8 @@ object SettingsActivityUtil {
		WifiControlAppListProvider.getAppInfoRoutePrefix(),
		NfcTagAppsSettingsProvider::class.qualifiedName to
		NfcTagAppsSettingsProvider.getAppInfoRoutePrefix(),
		VoiceActivationAppsListProvider::class.qualifiedName to
		VoiceActivationAppsListProvider.getAppInfoRoutePrefix(),
		)

		@JvmStatic

src/com/android/settings/spa/SettingsSpaEnvironment.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.settings.spa.app.specialaccess.NfcTagAppsSettingsProvider
		import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider
		import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
		import com.android.settings.spa.app.specialaccess.UseFullScreenIntentAppListProvider
		import com.android.settings.spa.app.specialaccess.VoiceActivationAppsListProvider
		import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider
		import com.android.settings.spa.app.storage.StorageAppListPageProvider
		import com.android.settings.spa.core.instrumentation.SpaLogProvider
		@@ -66,6 +67,7 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
		PictureInPictureListProvider,
		InstallUnknownAppsListProvider,
		AlarmsAndRemindersAppListProvider,
		VoiceActivationAppsListProvider,
		WifiControlAppListProvider,
		NfcTagAppsSettingsProvider,
		)

src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
		PictureInPictureListProvider,
		InstallUnknownAppsListProvider,
		AlarmsAndRemindersAppListProvider,
		VoiceActivationAppsListProvider,
		WifiControlAppListProvider,
		)
		.map { it.buildAppListInjectEntry().setLink(fromPage = owner).build() }