diff options
| author | Dan Morrill <morrildl@google.com> | 2011-06-13 11:59:38 -0700 |
|---|---|---|
| committer | Dan Morrill <morrildl@google.com> | 2011-06-13 11:59:38 -0700 |
| commit | 74e646cab9a28aa3716a05fc474853c2c557f942 (patch) | |
| tree | 1e7e03599638271f0c708ae4cfe4732b17bbeb2c /core | |
| parent | ed1a9c778c3345368e6d41485c1814e068046e92 (diff) | |
| parent | c2e1e32908e7d3065436c33baa678c9ce478bfa0 (diff) | |
| download | frameworks_base-74e646cab9a28aa3716a05fc474853c2c557f942.zip frameworks_base-74e646cab9a28aa3716a05fc474853c2c557f942.tar.gz frameworks_base-74e646cab9a28aa3716a05fc474853c2c557f942.tar.bz2 | |
Fix merge conflict for 'c2e1e329'.
Conflicts:
core/res/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
Diffstat (limited to 'core')
| -rwxr-xr-x | core/res/res/values/config.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 8856778..f93a8a3 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -611,4 +611,21 @@ Example 2: devices sold in India should include tables 4 through 13 to enable use of the new Release 9 tables for Indic languages. --> <integer-array name="config_sms_enabled_locking_shift_tables"></integer-array> + + <!-- Set and Unsets WiMAX --> + <bool name="config_wimaxEnabled">false</bool> + <!-- Location of the wimax framwork jar location --> + <string name="config_wimaxServiceJarLocation"></string> + <!-- Location of the wimax native library locaiton --> + <string name="config_wimaxNativeLibLocation"></string> + <!-- Name of the wimax manager class --> + <string name="config_wimaxManagerClassname"></string> + <!-- Name of the wimax service class --> + <string name="config_wimaxServiceClassname"></string> + <!-- Name of the wimax state tracker clas --> + <string name="config_wimaxStateTrackerClassname"></string> + + <!-- Set to true if the RSSI should always display CDMA signal strength + even on EVDO --> + <bool name="config_alwaysUseCdmaRssi">false</bool> </resources> |