diff options
38 files changed, 81 insertions, 686 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index c5c7fe3..758273b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/core/res/res/values-mcc214/config.xml b/core/res/res/values-mcc214/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc214/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc216/config.xml b/core/res/res/values-mcc216/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc216/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc219/config.xml b/core/res/res/values-mcc219/config.xml index 80f4e58..7ae82fa 100644 --- a/core/res/res/values-mcc219/config.xml +++ b/core/res/res/values-mcc219/config.xml @@ -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> diff --git a/core/res/res/values-mcc222/config.xml b/core/res/res/values-mcc222/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc222/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc226/config.xml b/core/res/res/values-mcc226/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc226/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc228/config.xml b/core/res/res/values-mcc228/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc228/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc230/config.xml b/core/res/res/values-mcc230/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc230/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc231/config.xml b/core/res/res/values-mcc231/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc231/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc232/config.xml b/core/res/res/values-mcc232/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc232/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc234/config.xml b/core/res/res/values-mcc234/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc234/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc238/config.xml b/core/res/res/values-mcc238/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc238/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc240/config.xml b/core/res/res/values-mcc240/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc240/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc242/config.xml b/core/res/res/values-mcc242/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc242/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc244/config.xml b/core/res/res/values-mcc244/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc244/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc246/config.xml b/core/res/res/values-mcc246/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc246/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc247/config.xml b/core/res/res/values-mcc247/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc247/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc248/config.xml b/core/res/res/values-mcc248/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc248/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc260/config.xml b/core/res/res/values-mcc260/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc260/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc262/config.xml b/core/res/res/values-mcc262/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc262/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc268/config.xml b/core/res/res/values-mcc268/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc268/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc270/config.xml b/core/res/res/values-mcc270/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc270/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc272/config.xml b/core/res/res/values-mcc272/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc272/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc274/config.xml b/core/res/res/values-mcc274/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc274/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc278/config.xml b/core/res/res/values-mcc278/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc278/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc280/config.xml b/core/res/res/values-mcc280/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc280/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc284/config.xml b/core/res/res/values-mcc284/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc284/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc286/config.xml b/core/res/res/values-mcc286/config.xml index f73a523..d99d051 100644 --- a/core/res/res/values-mcc286/config.xml +++ b/core/res/res/values-mcc286/config.xml @@ -61,7 +61,4 @@ to enable use of the new Release 9 tables for Indic languages. --> <!-- <integer-array name="config_sms_enabled_locking_shift_tables"></integer-array> --> - <!-- Whether safe headphone volume is enabled or not (country specific). --> - <bool name="config_safe_media_volume_enabled">true</bool> - </resources> diff --git a/core/res/res/values-mcc293/config.xml b/core/res/res/values-mcc293/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc293/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc294/config.xml b/core/res/res/values-mcc294/config.xml deleted file mode 100644 index 8d6d3b1..0000000 --- a/core/res/res/values-mcc294/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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> diff --git a/core/res/res/values-mcc202/config.xml b/core/res/res/values-mcc310/config.xml index 8d6d3b1..df398f9 100644 --- a/core/res/res/values-mcc202/config.xml +++ b/core/res/res/values-mcc310/config.xml @@ -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">true</bool> + <bool name="config_safe_media_volume_enabled">false</bool> </resources> diff --git a/core/res/res/values-mcc204/config.xml b/core/res/res/values-mcc311/config.xml index 8d6d3b1..df398f9 100644 --- a/core/res/res/values-mcc204/config.xml +++ b/core/res/res/values-mcc311/config.xml @@ -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">true</bool> + <bool name="config_safe_media_volume_enabled">false</bool> </resources> diff --git a/core/res/res/values-mcc206/config.xml b/core/res/res/values-mcc312/config.xml index 8d6d3b1..df398f9 100644 --- a/core/res/res/values-mcc206/config.xml +++ b/core/res/res/values-mcc312/config.xml @@ -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">true</bool> + <bool name="config_safe_media_volume_enabled">false</bool> </resources> diff --git a/core/res/res/values-mcc208/config.xml b/core/res/res/values-mcc313/config.xml index 8d6d3b1..df398f9 100644 --- a/core/res/res/values-mcc208/config.xml +++ b/core/res/res/values-mcc313/config.xml @@ -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">true</bool> + <bool name="config_safe_media_volume_enabled">false</bool> </resources> diff --git a/core/res/res/values-mcc314/config.xml b/core/res/res/values-mcc314/config.xml new file mode 100644 index 0000000..df398f9 --- /dev/null +++ b/core/res/res/values-mcc314/config.xml @@ -0,0 +1,25 @@ +<?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">false</bool> + +</resources> diff --git a/core/res/res/values-mcc315/config.xml b/core/res/res/values-mcc315/config.xml new file mode 100644 index 0000000..df398f9 --- /dev/null +++ b/core/res/res/values-mcc315/config.xml @@ -0,0 +1,25 @@ +<?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">false</bool> + +</resources> diff --git a/core/res/res/values-mcc316/config.xml b/core/res/res/values-mcc316/config.xml new file mode 100644 index 0000000..df398f9 --- /dev/null +++ b/core/res/res/values-mcc316/config.xml @@ -0,0 +1,25 @@ +<?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">false</bool> + +</resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 429a8a4..56c4d9e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1148,7 +1148,7 @@ <bool name="config_useDevInputEventForAudioJack">false</bool> <!-- 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> <!-- Set to true if the wifi display supports compositing content stored in gralloc protected buffers. For this to be true, there must exist |