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

Commit 6c966b35 authored by Michal Olech's avatar Michal Olech Committed by Android (Google) Code Review
Browse files

Merge "Add system prompt for system language change after <Set Menu Language> CEC message"

parents d00a8b52 6f1aecf1

core/java/android/hardware/hdmi/HdmiControlManager.java

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ public final class HdmiControlManager { 
    public static final String EXTRA_MESSAGE_EXTRA_PARAM1 =

            "android.hardware.hdmi.extra.MESSAGE_EXTRA_PARAM1";



    /**

     * Used as an extra field in the Set Menu Language intent. Contains the requested locale.

     * @hide

     */

    public static final String EXTRA_LOCALE = "android.hardware.hdmi.extra.LOCALE";



    /**

     * Volume value for mute state.

     */

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10664,6 +10664,15 @@ public final class Settings { 
        @Readable

        public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled";













        /**













         * Setting to store denylisted system languages by the CEC {@code <Set Menu Language>}













         * confirmation dialog.













         *













         * @hide













         */













        public static final String HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST =













                "hdmi_cec_set_menu_language_denylist";



























        /**















         * These entries are considered common between the personal and the managed profile,















         * since the managed profile doesn't get to change them.

































core/res/res/values/config.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -2891,6 +2891,11 @@













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















            >com.android.systemui/com.android.systemui.sensorprivacy.SensorUseStartedActivity</string>





























    <!-- 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>





























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















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















            >com.android.vpndialogs/com.android.vpndialogs.PlatformVpnConfirmDialog</string>

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -375,6 +375,7 @@













  <java-symbol type="string" name="config_usbConfirmActivity" />















  <java-symbol type="string" name="config_usbResolverActivity" />















  <java-symbol type="string" name="config_sensorUseStartedActivity" />













  <java-symbol type="string" name="config_hdmiCecSetMenuLanguageActivity" />















  <java-symbol type="integer" name="config_minNumVisibleRecentTasks_lowRam" />















  <java-symbol type="integer" name="config_maxNumVisibleRecentTasks_lowRam" />















  <java-symbol type="integer" name="config_minNumVisibleRecentTasks_grid" />

































data/etc/com.android.systemui.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -74,5 +74,6 @@













        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />















        <permission name="android.permission.FORCE_STOP_PACKAGES" />















        <permission name="android.permission.ACCESS_FPS_COUNTER" />













        <permission name="android.permission.CHANGE_CONFIGURATION" />















    </privapp-permissions>















</permissions>