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

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

Merge "Revert "Headphones volume warning disabled by default"" into klp-dev

parents 1d7b3dc1 f971b1ee

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks) 
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/effects/)

$(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-mcc214/config.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<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">true</bool>



</resources>

core/res/res/values-mcc216/config.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<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">true</bool>



</resources>

core/res/res/values-mcc219/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,4 @@ 
        <item>"96"</item>

    </string-array>



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

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



</resources>

core/res/res/values-mcc222/config.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<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">true</bool>



</resources>