diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-22 16:04:00 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-22 16:04:00 -0700 |
| commit | fc398af5f80ba522da2f95453566be800edd4021 (patch) | |
| tree | f0e96b1bf1e3aaee8f68ea894e4b3ea51eb626f8 /overlay | |
| parent | 129629da577719c95e27b84616c2c3cafc10dc86 (diff) | |
| parent | 40717996bb4b66460a7b619b6da77b1d830f3379 (diff) | |
| download | device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.zip device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.tar.gz device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.tar.bz2 | |
resolved conflicts for merge of 40717996 to master
Change-Id: I36d3e5330eff7580dc2bf28c076062de4b418561
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 60d99b7..c03ea02 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -147,12 +147,15 @@ <item>"usb0"</item> </string-array> - <!-- Regex array of allowable upstream ifaces for tethering - for example if you want - tethering on a new interface called "foo2" add <item>"foo\\d"</item> to the array --> - <string-array translatable="false" name="config_tether_upstream_regexs"> - <item>"rmnet\\d"</item> - <item>"eth\\d"</item> - </string-array> + <!-- Array of allowable ConnectivityManager network types for tethering --> + <!-- Common options are [1, 4] for wifi and dun or [0,1,5,7] for --> + <!-- mobile, wifi, hipri and bluetooth --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>0</item> + <item>1</item> + <item>5</item> + <item>7</item> + </integer-array> <!-- List of regexpressions describing the interface (if any) that represent tetherable Wifi interfaces. If the device doesn't want to support tethering over Wifi this @@ -168,9 +171,6 @@ <item>"bnep\\d"</item> </string-array> - <!-- Boolean indicating if we require the use of DUN on mobile for tethering --> - <bool translatable="false" name="config_tether_dun_required">false</bool> - <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap --> <integer-array name="config_keyboardTapVibePattern"> <item>30</item> |