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

Commit 4072691f authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge changes from topic "config_hidePS" into main 

* changes:
  Define new config to enable Private space Hide Illustration
  Bug fix flag to hide private space search illustration
parents 247b04f0 945a8761

core/java/android/content/pm/multiuser.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -337,3 +337,13 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "private_space_search_illustration_config"

  namespace: "profile_experiences"

  description: "Check config to show/hide the private space search illustration and search tile content in Hide Private Space settings page"

  bug: "346612477"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -7096,4 +7096,8 @@ 


    <!-- Whether to enable usb state update via udc sysfs. -->

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



    <!-- Whether to enable the private space search illustration and search tile content in "Hide Private Space" settings page.

         OEM/Partner can explicitly opt to hide the illustration and search tile content. -->

    <bool name="config_enableSearchTileHideIllustrationInPrivateSpace">true</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ 
  <java-symbol type="bool" name="config_notificationCloseButtonSupported"/>

  <java-symbol type="bool" name="config_enableGaiaEducationInPrivateSpace"/>

  <java-symbol type="bool" name="config_enableUdcSysfsUsbStateUpdate"/>

  <java-symbol type="bool" name="config_enableSearchTileHideIllustrationInPrivateSpace"/>



  <java-symbol type="color" name="tab_indicator_text_v4" />