diff options
| author | Eric Fischer <enf@google.com> | 2009-07-28 11:27:07 -0700 |
|---|---|---|
| committer | Eric Fischer <enf@google.com> | 2009-07-28 11:27:07 -0700 |
| commit | f7573bd2b7bb63d78fa8f0003ba49be10b128753 (patch) | |
| tree | fe041ae80b91b29ca45bf6f13926ceb69eb87855 /packages/SettingsProvider/res/values/defaults.xml | |
| parent | b3c82efb4725e959a50dca3f7ff50d1d99a059b4 (diff) | |
| parent | cdb9e971d9d62d399756dcb688ac6c3a6c31383f (diff) | |
| download | frameworks_base-f7573bd2b7bb63d78fa8f0003ba49be10b128753.zip frameworks_base-f7573bd2b7bb63d78fa8f0003ba49be10b128753.tar.gz frameworks_base-f7573bd2b7bb63d78fa8f0003ba49be10b128753.tar.bz2 | |
resolved conflicts for merge of cdb9e971 to master
Diffstat (limited to 'packages/SettingsProvider/res/values/defaults.xml')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index af02741..c33bdd7 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -21,7 +21,7 @@ <integer name="def_screen_off_timeout">60000</integer> <bool name="def_airplane_mode_on">false</bool> <!-- Comma-separated list of bluetooth, wifi, and cell. --> - <string name="def_airplane_mode_radios">cell,bluetooth,wifi</string> + <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi</string> <bool name="def_auto_time">true</bool> <bool name="def_accelerometer_rotation">true</bool> <!-- Default screen brightness, from 0 to 255. 102 is 40%. --> @@ -35,7 +35,7 @@ Network location is off by default because it requires user opt-in via Setup Wizard or Settings. --> - <string name="def_location_providers_allowed">gps</string> + <string name="def_location_providers_allowed" translatable="false">gps</string> <bool name="assisted_gps_enabled">true</bool> <!-- 0 == mobile, 1 == wifi. --> <integer name="def_network_preference">1</integer> @@ -44,5 +44,5 @@ <bool name="def_networks_available_notification_on">true</bool> <bool name="def_backup_enabled">false</bool> - <string name="def_backup_transport"></string> + <string name="def_backup_transport" translatable="false"></string> </resources> |