From 66d23b7eac899670ff86bf4a945049985aab4707 Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <Rodrigo Damazio@localhost>
Date: Tue, 23 Nov 2010 22:11:04 -0800
Subject: [PATCH] Fixing permission descriptions so they show up properly in
 application manager

---
 MyTracks/AndroidManifest.xml    | 9 ++++++---
 MyTracks/res/values/strings.xml | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 08c3131c5..31dcddcf9 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -115,15 +115,18 @@
   <!-- Exported permissions (for other apps to use our features) -->
   <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:description="@string/notification_permission_summary"
+              android:label="@string/notification_permission_label"
+              android:description="@string/notification_permission_description"
               android:protectionLevel="normal" />
   <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:description="@string/read_tracks_permission_summary"
+              android:label="@string/read_tracks_permission_label"
+              android:description="@string/read_tracks_permission_description"
               android:protectionLevel="dangerous" />
   <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:description="@string/write_tracks_permission_summary"
+              android:label="@string/write_tracks_permission_label"
+              android:description="@string/write_tracks_permission_description"
               android:protectionLevel="dangerous" />
   <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
   <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 5a4facb03..59354f03b 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -480,7 +480,10 @@ limitations under the License.
   <string name="heart_rate_monitor_enabled">Heart rate monitor enabled</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_summary">Be notified about track recording start/stop.</string>
-  <string name="read_tracks_permission_summary">Be able to read track data, such as points and waypoints</string>
-  <string name="write_tracks_permission_summary">Be able to write track data, such start recording and add waypoints</string>
+  <string name="notification_permission_label">receive track recording notifications</string>
+  <string name="read_tracks_permission_label">read recorded track data</string>
+  <string name="write_tracks_permission_label">write recorded track data, start/stop recording tracks</string>
+  <string name="notification_permission_description">Be notified when a track starts or stops being recorded.</string>
+  <string name="read_tracks_permission_description">Be able to read track data, such as points and waypoints.</string>
+  <string name="write_tracks_permission_description">Be able to write track data, such as starting recording or adding waypoints.</string>
 </resources>