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

Commit 5c8ed931 authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge "[AAPM] Add help uri" into main

parents 73821a2c 3efe8bc3

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -6112,6 +6112,9 @@ 
    <!-- Whether to default to an expanded list of users on the lock screen user switcher. -->

    <bool name="config_expandLockScreenUserSwitcher">false</bool>



    <!-- Help URI, action disabled by advanced protection [DO NOT TRANSLATE] -->

    <string name="config_help_url_action_disabled_by_advanced_protection" translatable="false"></string>



    <!-- Toasts posted from these packages will be shown to the current user, regardless of the user

         the process belongs to. This is useful for packages that run under a single user but serve

         multiple users, e.g. the system.

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -5964,6 +5964,8 @@ 
  <!-- Device CMF Theming Settings -->

  <java-symbol type="array" name="theming_defaults" />



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



  <!-- Advanced Protection Service USB feature -->

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

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