diff options
| author | Victoria Lease <violets@google.com> | 2012-09-16 13:06:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 13:06:08 -0700 |
| commit | 306df86302a96c7bf3d86aed81190c10ea6c2ccd (patch) | |
| tree | e1ca402b577b1db134a4b139416aa3e1f76647fb | |
| parent | b1861c3e89c3e869c95c5c01b78320a1dcef26ad (diff) | |
| parent | b278933bbf60a3762868c2294412582bb5d23364 (diff) | |
| download | frameworks_base-306df86302a96c7bf3d86aed81190c10ea6c2ccd.zip frameworks_base-306df86302a96c7bf3d86aed81190c10ea6c2ccd.tar.gz frameworks_base-306df86302a96c7bf3d86aed81190c10ea6c2ccd.tar.bz2 | |
Merge "New location service permission strings." into jb-mr1-dev
| -rwxr-xr-x | core/res/res/values/strings.xml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 1950d84..859886b 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1255,26 +1255,26 @@ such as GPS or location providers.</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_accessFineLocation">precise (GPS) location</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_accessFineLocation" product="tablet">Access precise - location sources such as the Global Positioning System on the tablet. When - location services are available and turned on, this permission allows the - app to determine your precise location.</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_accessFineLocation" product="default">Access precise - location sources such as the Global Positioning System on the phone. When - location services are available and turned on, this permission allows the - app to determine your precise location.</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_accessCoarseLocation">approximate (network-based) location</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_accessCoarseLocation">Access - approximate location from location providers using network sources such as - cell tower and Wi-Fi. When these location services are available and turned - on, this permission allows the app to determine your approximate - location.</string> + <string name="permlab_accessFineLocation">precise location (GPS and + network-based)</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_accessFineLocation">Allows the app to get your + precise location using the Global Positioning System (GPS) or network + location sources such as cell towers and Wi-Fi. These location services + must be turned on and available to your device for the app to use them. + Apps may use this to determine where you are, and may consume additional + battery power.</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_accessCoarseLocation">approximate location + (network-based)</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_accessCoarseLocation">Allows the app to get your + approximate location. This location is derived by location services using + network location sources such as cell towers and Wi-Fi. These location + services must be turned on and available to your device for the app to + use them. Apps may use this to determine approximately where you + are.</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_accessSurfaceFlinger">access SurfaceFlinger</string> |