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

Commit 0f13e347 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Add platform config for Output Switcher" into tm-dev... 

Merge "[Output Switcher] Add platform config for Output Switcher" into tm-dev am: 9e042e9d am: f7aa3a90 am: df49bb6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19600072



Change-Id: I76c85f7e237bc932e18ddca9ed958bec37d6a2f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd6029b2 df49bb6a

core/res/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -2004,6 +2004,9 @@ 
         on grouped devices. -->

         on grouped devices. -->

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

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





    <!-- Flag indicating current media Output Switcher version. -->

    <integer name="config_mediaOutputSwitchDialogVersion">1</integer>



    <!-- Flag indicating that an outbound call must have a call capable phone account

    <!-- Flag indicating that an outbound call must have a call capable phone account

         that has declared it can process the call's handle. -->

         that has declared it can process the call's handle. -->

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

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

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -4698,6 +4698,8 @@ 




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

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





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



  <!-- List of shared library packages that should be loaded by the classloader after the

  <!-- List of shared library packages that should be loaded by the classloader after the

       code and resources provided by applications. -->

       code and resources provided by applications. -->

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

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