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

Commit 097a5669 authored Aug 03, 2023 by Nikolas Havrikov

Fix resolving TvSystemUI intents

This CL accounts for the renaming of Activities that occured during the
move of the TV-specific System UI classes into a new compilation target.

Bug: 294380464
Test: manually
Change-Id: Ic0d4c02416a2f2dbb2a117d1a6f4826eeca4bcbe

parent 228bfe17

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

+5 −5

Original line number	Original line	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		<!-- Component name of the activity used to inform a user about a sensory being blocked because
	of privacy settings. -->		of privacy settings. -->
	<string name="config_sensorUseStartedActivity" translatable="false">		<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>		</string>

	<!-- Component name of the activity used to inform a user about a sensory being blocked because		<!-- Component name of the activity used to inform a user about a sensory being blocked because
	of hardware privacy switches. -->		of hardware privacy switches. -->
	<string name="config_sensorUseStartedActivity_hwToggle" translatable="false">		<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>		</string>

	<!-- Component name of the activity used to inform a user about a sensor privacy update from		<!-- Component name of the activity used to inform a user about a sensor privacy update from
	SW/HW privacy switches. -->		SW/HW privacy switches. -->
	<string name="config_sensorStateChangedActivity" translatable="false">		<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>		</string>

	<!-- Component name of the activity that shows the request for access to a usb device. -->		<!-- Component name of the activity that shows the request for access to a usb device. -->
	<string name="config_usbPermissionActivity" translatable="false">		<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>		</string>

	<!-- Component name of the activity that confirms the activity to start when a usb device is		<!-- Component name of the activity that confirms the activity to start when a usb device is
	plugged in. -->		plugged in. -->
	<string name="config_usbConfirmActivity" translatable="false">		<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>		</string>
	</resources>		</resources>

core/res/res/values/config.xml

+3 −2

Original line number	Original line	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		<!-- Component name of the activity used to ask a user to confirm system language change after
	receiving <Set Menu Language> CEC message. -->		receiving <Set Menu Language> CEC message. -->
	<string name="config_hdmiCecSetMenuLanguageActivity"		<string name="config_hdmiCecSetMenuLanguageActivity">
	>com.android.systemui/com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity</string>		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 -->		<!-- Name of the dialog that is used to request the user's consent for a Platform VPN -->
	<string name="config_platformVpnConfirmDialogComponent" translatable="false"		<string name="config_platformVpnConfirmDialogComponent" translatable="false"