diff options
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml | 37 |
2 files changed, 41 insertions, 1 deletions
@@ -29,6 +29,10 @@ PRODUCT_PACKAGES += \ regulatory.bin \ lib_driver_cmd_wl12xx +# BT vendor lib (fixes crashing) +PRODUCT_PACKAGES += \ + libbt-vendor + #ifdef USES_TI_MAC80211 # Permissions #PRODUCT_COPY_FILES += \ @@ -46,7 +50,6 @@ PRODUCT_COPY_FILES += \ # Prebuilts /system/etc PRODUCT_COPY_FILES += \ $(OTTER_COMMON_FOLDER)/prebuilt/etc/audio_policy.conf:/system/etc/audio_policy.conf \ - frameworks/av/media/libstagefright/data/media_codecs_ffmpeg.xml:system/etc/media_codecs_ffmpeg.xml \ $(OTTER_COMMON_FOLDER)/prebuilt/etc/mixer_paths.xml:/system/etc/mixer_paths.xml \ $(OTTER_COMMON_FOLDER)/prebuilt/etc/wifi/TQS_S_2.6.ini:/system/etc/wifi/TQS_S_2.6.ini \ $(OTTER_COMMON_FOLDER)/prebuilt/etc/wifi/p2p_supplicant_overlay.conf:/system/etc/wifi/p2p_supplicant_overlay.conf \ diff --git a/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml b/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml new file mode 100644 index 0000000..b3573ee --- /dev/null +++ b/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + /* //device/apps/common/assets/res/any/colors.xml + ** + ** Copyright 2006, 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"> + + <!-- Defines the shutdown options shown in the reboot dialog. --> + <array name="shutdown_reboot_options" translatable="false"> + <item>@string/reboot_reboot</item> + <item>@string/reboot_soft</item> + <item>@string/reboot_recovery</item> + </array> + + <!-- Do not translate. Defines the shutdown actions passed to the kernel. + The first item should be empty for regular reboot. --> + <string-array name="shutdown_reboot_actions" translatable="false"> + <item></item> + <item>soft_reboot</item> + <item>recovery</item> + </string-array> + +</resources> |