summaryrefslogtreecommitdiffstats
path: root/overlay/frameworks
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-07-23 03:04:48 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-07-23 03:04:48 +0200
commit8e8baa74c467a51dcf1338d3096875f5a0baf868 (patch)
treea2bb25cd987bd47e79f0bc2399f6dd46b42acffc /overlay/frameworks
parent55709d40c8df61c6badb8a8ecab6ebfd34b95d60 (diff)
parentb5f4a69e24cd5dae6c2d014b078c3a2966d14611 (diff)
downloaddevice_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.zip
device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.gz
device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.bz2
Merge remote-tracking branch 'github/ics' into 23072012
Conflicts: Android.mk BoardConfigCommon.mk board-info.txt device_base.mk egl.cfg factory-images/generate-factory-images-package.sh kernel overlay/frameworks/base/core/res/res/values/config.xml Change-Id: If153de549a1a3b5145f856de6c55c825d3124a11
Diffstat (limited to 'overlay/frameworks')
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml3
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/config.xml29
2 files changed, 32 insertions, 0 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d480b15..d619a60 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -208,7 +208,10 @@
<bool name="config_ui_enableFadingMarquee">false</bool>
+ <bool name="config_bluetooth_adapter_quick_switch">false</bool>
+
<!-- The attenuation in dB applied to the sound effects played
through AudioManager.playSoundEffect() when no volume is specified. -->
<integer name="config_soundEffectVolumeDb">-12</integer>
+
</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..555da6b
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <!-- Control whether status bar should distinguish HSPA data icon form UMTS
+ data icon on devices -->
+ <bool name="config_hspa_data_distinguishable">true</bool>
+
+</resources>
+