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

Commit c00b3c77 authored by Faye Yan's avatar Faye Yan Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add Voice activation apps into Settings->Apps->Special a..."" into main

parents b7f3c5a6 d0b08818

res/values/strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -9834,13 +9834,6 @@ 
    <!-- 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. Built-in adaptive sensing ensures data stays private only to 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



+0
−5






























Original line number
Diff line number
Diff line








@@ -116,11 +116,6 @@













        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



+0
−3






























Original line number
Diff line number
Diff line








@@ -38,7 +38,6 @@ 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


























@@ -67,8 +66,6 @@ object SettingsActivityUtil {













            WifiControlAppListProvider.getAppInfoRoutePrefix(),















        NfcTagAppsSettingsProvider::class.qualifiedName to















            NfcTagAppsSettingsProvider.getAppInfoRoutePrefix(),













        VoiceActivationAppsListProvider::class.qualifiedName to













            VoiceActivationAppsListProvider.getAppInfoRoutePrefix(),















        BackupTasksAppsListProvider::class.qualifiedName to















            BackupTasksAppsListProvider.getAppInfoRoutePrefix(),















    )

































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



+0
−2






























Original line number
Diff line number
Diff line








@@ -41,7 +41,6 @@ import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider













import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider















import com.android.settings.spa.app.specialaccess.TurnScreenOnAppsAppListProvider















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










@@ -76,7 +75,6 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {













            PictureInPictureListProvider,















            InstallUnknownAppsListProvider,















            AlarmsAndRemindersAppListProvider,













            VoiceActivationAppsListProvider,















            WifiControlAppListProvider,















            NfcTagAppsSettingsProvider,















            LongBackgroundTasksAppListProvider,

































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



+0
−1






























Original line number
Diff line number
Diff line








@@ -67,7 +67,6 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {













                PictureInPictureListProvider,















                InstallUnknownAppsListProvider,















                AlarmsAndRemindersAppListProvider,













                VoiceActivationAppsListProvider,















                WifiControlAppListProvider,















                LongBackgroundTasksAppListProvider,















                TurnScreenOnAppsAppListProvider,