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

Commit 38b23225 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Headphones volume warning disabled by default"

parents cee04b57 7cf06209

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/framework-res_intermediates)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/res/res/values-mcc310/config.xml→core/res/res/values-mcc202/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Whether safe headphone volume is enabled or not (country specific). -->

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

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



</resources>

core/res/res/values-mcc311/config.xml→core/res/res/values-mcc204/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Whether safe headphone volume is enabled or not (country specific). -->

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

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



</resources>

core/res/res/values-mcc312/config.xml→core/res/res/values-mcc206/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Whether safe headphone volume is enabled or not (country specific). -->

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

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



</resources>

core/res/res/values-mcc313/config.xml→core/res/res/values-mcc208/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Whether safe headphone volume is enabled or not (country specific). -->

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

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



</resources>