diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-31 01:16:45 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-31 01:16:45 -0700 |
| commit | 4398876d6ec2dd3102acb3da4980f8e53243d372 (patch) | |
| tree | 878049c8a5c4ea54166d24ec6c4108dbf4580905 /core/res | |
| parent | 9d17c057bdb9da5fa991a2c3efebe453106ca0a7 (diff) | |
| parent | 6ec711f4b17dbdccffa3a50b4dad7a1cb9b53aad (diff) | |
| download | frameworks_base-4398876d6ec2dd3102acb3da4980f8e53243d372.zip frameworks_base-4398876d6ec2dd3102acb3da4980f8e53243d372.tar.gz frameworks_base-4398876d6ec2dd3102acb3da4980f8e53243d372.tar.bz2 | |
merge master to master_gl
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | core/res/res/raw/latin_lowercase | bin | 28494 -> 28496 bytes | |||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b97e07b..0a24bb7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -644,6 +644,13 @@ android:description="@string/permdesc_changeWifiState" android:label="@string/permlab_changeWifiState" /> + <!-- Allows applications to enter Wi-Fi Multicast mode --> + <permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_changeWifiMulticastState" + android:label="@string/permlab_changeWifiMulticastState" /> + <!-- Allows applications to discover and pair bluetooth devices --> <permission android:name="android.permission.BLUETOOTH_ADMIN" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" diff --git a/core/res/res/raw/latin_lowercase b/core/res/res/raw/latin_lowercase Binary files differindex 17cfaf0..443d5f8 100644 --- a/core/res/res/raw/latin_lowercase +++ b/core/res/res/raw/latin_lowercase diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 6512006..39485e2 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1012,6 +1012,15 @@ configured Wi-Fi networks.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_changeWifiMulticastState">allow Wi-Fi Multicast + reception</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_changeWifiMulticastState">Allows an application to + receive packets not directly addressed to your device. This can be + useful when discovering services offered near by. It uses more power + than the non-multicast mode.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_bluetoothAdmin">bluetooth administration</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_bluetoothAdmin">Allows an application to configure diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 490abde..72402d0 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -177,7 +177,7 @@ <item name="android:uncertainGestureColor">#48ffff00</item> <item name="android:fadeOffset">420</item> <item name="android:fadeDuration">150</item> - <item name="android:gestureStrokeLengthThreshold">30.0</item> + <item name="android:gestureStrokeLengthThreshold">50.0</item> <item name="android:gestureStrokeSquarenessThreshold">0.275</item> <item name="android:gestureStrokeAngleThreshold">40.0</item> <item name="android:eventsInterceptionEnabled">true</item> |