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

Commit bc048111 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix resolving TvSystemUI intents" into main

parents 103af15f 097a5669

core/res/res/values-television/config.xml

+5 −5
Original line number Diff line number Diff line
@@ -45,29 +45,29 @@ 
    <!-- Component name of the activity used to inform a user about a sensory being blocked because

     of privacy settings. -->

    <string name="config_sensorUseStartedActivity" translatable="false">

        com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity

        com.android.systemui/com.android.systemui.tv.sensorprivacy.TvUnblockSensorActivity

    </string>



    <!-- Component name of the activity used to inform a user about a sensory being blocked because

     of hardware privacy switches. -->

    <string name="config_sensorUseStartedActivity_hwToggle" translatable="false">

        com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity

        com.android.systemui/com.android.systemui.tv.sensorprivacy.TvUnblockSensorActivity

    </string>



    <!-- Component name of the activity used to inform a user about a sensor privacy update from

     SW/HW privacy switches. -->

    <string name="config_sensorStateChangedActivity" translatable="false">

        com.android.systemui/com.android.systemui.sensorprivacy.television.TvSensorPrivacyChangedActivity

        com.android.systemui/com.android.systemui.tv.sensorprivacy.TvSensorPrivacyChangedActivity

    </string>



    <!-- Component name of the activity that shows the request for access to a usb device. -->

    <string name="config_usbPermissionActivity" translatable="false">

        com.android.systemui/com.android.systemui.usb.tv.TvUsbPermissionActivity

        com.android.systemui/com.android.systemui.tv.usb.TvUsbPermissionActivity

    </string>



    <!-- Component name of the activity that confirms the activity to start when a usb device is

     plugged in. -->

    <string name="config_usbConfirmActivity" translatable="false">

        com.android.systemui/com.android.systemui.usb.tv.TvUsbConfirmActivity

        com.android.systemui/com.android.systemui.tv.usb.TvUsbConfirmActivity

    </string>

</resources>

core/res/res/values/config.xml

+3 −2
Original line number Diff line number Diff line
@@ -3212,8 +3212,9 @@ 


    <!-- Component name of the activity used to ask a user to confirm system language change after

         receiving <Set Menu Language> CEC message. -->

    <string name="config_hdmiCecSetMenuLanguageActivity"

            >com.android.systemui/com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity</string>

    <string name="config_hdmiCecSetMenuLanguageActivity">

        com.android.systemui/com.android.systemui.tv.hdmi.HdmiCecSetMenuLanguageActivity

    </string>



    <!-- Name of the dialog that is used to request the user's consent for a Platform VPN -->

    <string name="config_platformVpnConfirmDialogComponent" translatable="false"